More improvements for use with menu in-window

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@34951 72102866-910b-0410-8b05-ffd578937521

Apps/EOModelEditor/AdaptorsPanel.h

@@ -31,7 +31,7 @@
 
 @interface AdaptorsPanel : NSObject
 {
-  NSWindow  *_window;
+  NSPanel   *_window;
   NSBrowser *brws_adaptors;
   NSButton  *btn_ok;
   NSButton  *btn_cancel;

Apps/EOModelEditor/AdaptorsPanel.m

@@ -52,11 +52,11 @@ static NSArray *_adaptorNames;
       NSRect fr1, fr2;
       _adaptorNames = RETAIN([EOAdaptor availableAdaptorNames]);
       /* redo all these numbers so buttons and labels are on the right? */
-      _window = [[NSWindow alloc]
+      _window = [[NSPanel alloc]
-                initWithContentRect: NSMakeRect(200,200,200,300)
+		  initWithContentRect: NSMakeRect(200,200,200,300)
-                          styleMask: NSBorderlessWindowMask | NSTitledWindowMask
+			    styleMask: NSBorderlessWindowMask | NSTitledWindowMask
-                            backing: NSBackingStoreBuffered
+			      backing: NSBackingStoreBuffered
-                              defer: YES];
+				defer: YES];
       [_window setTitle: @"Select adaptor"];
       [_window setReleasedWhenClosed:NO];
       

Apps/EOModelEditor/EOWindow.h

@@ -0,0 +1,29 @@
+/*
+    EOWindow.h
+ 
+    Author: German A. Arias <german@xelalug.org>
+    Date: Mar 2012
+
+    This file is part of EOModelEditor.
+
+    EOModelEditor is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+    
+    This application is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+    
+    You should have received a copy of the GNU General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+*/ 
+
+#import <AppKit/AppKit.h>
+
+@interface EOWindow : NSWindow
+{
+}
+@end

Apps/EOModelEditor/EOWindow.m

@@ -0,0 +1,33 @@
+/*
+    EOWindow.m
+ 
+    Author: German A. Arias <german@xelalug.org>
+    Date: Mar 2012
+
+    This file is part of EOModelEditor.
+
+    EOModelEditor is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+    
+    This application is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+    
+    You should have received a copy of the GNU General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+*/ 
+
+#import "EOWindow.h"
+
+@implementation EOWindow
+
+- (BOOL) canBecomeMainWindow
+{
+  return NO;
+}
+
+@end

Apps/EOModelEditor/GNUmakefile

@@ -90,6 +90,7 @@ $(APP_NAME)_OBJC_FILES =		\
 	Preferences.m			\
 	ConsistencyChecker.m		\
   CodeGenerator.m \
-  DataBrowser.m
+  DataBrowser.m \
+  EOWindow.m
 
 include $(GNUSTEP_MAKEFILES)/application.make

Apps/EOModelEditor/Resources/DataBrowser.gsmarkup

@@ -3,7 +3,7 @@
 <gsmarkup> 
 	<objects>
     
-		<window title="Data Browser" id="window" delegate="#NSOwner" releasedWhenClosed="yes"
+		<window instanceOf="EOWindow" title="Data Browser" id="window" delegate="#NSOwner" releasedWhenClosed="yes"
     resizable="yes">
       <vbox>
         <box topPadding="2" bottomPadding="2" leftPadding="4" rightPadding="4">

Apps/EOModelEditor/Resources/SQLGenerator.gsmarkup

@@ -3,7 +3,7 @@
 <gsmarkup> 
 	<objects>
     
-		<window title="SQL Generation" id="sqlgenWindow" delegate="#NSOwner" resizable="yes">
+		<window instanceOf="EOWindow" title="SQL Generation" id="sqlgenWindow" delegate="#NSOwner" resizable="yes">
 			<vbox leftPadding="10" padding="10">
 				<box title="SQL Generation Options" topPadding="10"
 					leftPadding="15" rightPadding="15" width="425">

ChangeLog

@@ -1,3 +1,17 @@
+2012-03-19  German A. Arias  <german@xelalug.org>
+
+	* EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.h:
+	* EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m:
+	* Apps/EOModelEditor/AdaptorsPanel.h:
+	* Apps/EOModelEditor/AdaptorsPanel.m: Use a panel instead a window.
+	So the menu isn't displayed when the user use NSWindows95InterfaceStyle.
+	* Apps/EOModelEditor/EOWindow.h:
+	* Apps/EOModelEditor/EOWindow.m:
+	* Apps/EOModelEditor/GNUmakefile: New class for auxiliary windows.
+	* Apps/EOModelEditor/Resources/SQLGenerator.gsmarkup:
+	* Apps/EOModelEditor/Resources/DataBrowser.gsmarkup: Instances of
+	class EOWindow, this avoid display the menu.
+
 2012-03-18  German A. Arias  <german@xelalug.org>
 
 	* Apps/EOModelEditor/EOModelEditorApp.h:

EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.h

@@ -32,13 +32,13 @@
 @class NSButton;
 @class NSImageView;
 @class NSComboBox;
-@class NSWindow;
+@class NSPanel;
 @class NSSecureTextField;
 
 @interface PostgreSQLLoginPanel : EOLoginPanel
 {
   /* gui stuff */ 
-  NSWindow *_win;
+  NSPanel *_win;
   NSComboBox *databasesCombo;
   NSImageView *logo;
 

EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m

@@ -333,7 +333,7 @@ vfmaxf (int n, float aFloat, ...)
       tempRect.origin.x = (screenSize.width/2) - (tempRect.size.width/2);
       tempRect.origin.y = (screenSize.height/2) - (tempRect.size.height/2);
       
-      _win = [[NSWindow alloc] initWithContentRect: tempRect 
+      _win = [[NSPanel alloc] initWithContentRect: tempRect 
 			       styleMask: NSTitledWindowMask
 			       backing: NSBackingStoreBuffered
 			       defer: YES];