some tweaks for wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/src/Makefile.pre.in b/utils/wxPython/src/Makefile.pre.in
index 34da6f3eb052d25f722b00385fcf6fb4922e80da..03490bf91b1bcb3b6288a7530089d2acee3e52dd 100644 (file)
--- a/utils/wxPython/src/Makefile.pre.in
+++ b/utils/wxPython/src/Makefile.pre.in
@@ -177,6 +177,16 @@ INSTALL=   $(LIBPL)/install-sh -c
 # Also, making them read-only seems to be a good idea...
 INSTALL_SHARED=        ${INSTALL} -m 555
 
 # Also, making them read-only seems to be a good idea...
 INSTALL_SHARED=        ${INSTALL} -m 555
 

+#---------------------------------------------------
+# Possibly change some definintions for C++
+ifdef MY_LDSHARED
+LDSHARED=$(MY_LDSHARED)
+endif
+ifdef MY_LINKCC
+LINKCC=$(MY_LINKCC)
+endif
+
+

 # === Fixed rules ===
 
 # Default target.  This builds shared libraries only
 # === Fixed rules ===
 
 # Default target.  This builds shared libraries only


@@ -198,7 +208,7 @@ $(TARGET):  $(ADDOBJS) lib.a $(PYTHONLIBS) Makefile $(BASELIB)
 
 #------------------------------------------------------------------------
 #------------------------------------------------------------------------
 
 #------------------------------------------------------------------------
 #------------------------------------------------------------------------

-# This is a defaul version of the install target for wxPython.  It just
+# This is a default version of the install target for wxPython.  It just

 # redirects to wxInstall below...
 
 install:       wxInstall
 # redirects to wxInstall below...
 
 install:       wxInstall


@@ -314,9 +324,6 @@ distclean:  clobber
 # Custom rules and dependencies added for wxPython
 #
 
 # Custom rules and dependencies added for wxPython
 #
 

-ifdef MY_LDSHARED
-LDSHARED=$(MY_LDSHARED)
-endif

 
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__
 
 
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__
 

diff --git a/utils/wxPython/src/Setup.in b/utils/wxPython/src/Setup.in
index 5213f7d9ddd7fda38430941bf52162b5b0310a94..935dea032bf383f44008324a36d6df6c896d404b 100644 (file)
--- a/utils/wxPython/src/Setup.in
+++ b/utils/wxPython/src/Setup.in
@@ -1,6 +1,10 @@
 # This file gives the details of what is needed to build this extension
 # module so the Makefile can be created.
 
 # This file gives the details of what is needed to build this extension
 # module so the Makefile can be created.
 

+###
+### This file should be created by configure.  Currently it is tweaked by hand.
+###
+

 *shared*
 
 CCC=c++
 *shared*
 
 CCC=c++


@@ -10,19 +14,29 @@ srcdir=$(GENCODEDIR)
 
 # Depending on how your Python was built, you may have to set this
 # value to use the C++ driver to link with instead of the default
 
 # Depending on how your Python was built, you may have to set this
 # value to use the C++ driver to link with instead of the default

-# C driver.  Fo rexample:
-MY_LDSHARED=$(CCC) -shared
+# C driver.  For example:
+#MY_LDSHARED=$(CCC) -shared
+MY_LINKCC=$(CCC) --verbose

 
 
 
 

-## Pick one of these, or set your own
-#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
+## Pick one of these, or set your own.  This is where the
+## wxPython module should be installed.  It should be a
+## subdirectory named wxPython.

 TARGETDIR=..
 TARGETDIR=..

+#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
+
+
+wxpc   wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+       mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
+       # CFLAGS
+       -I. -I$(WXWIN)/include -I/usr/local/lib/glib/include -I$(WXWIN)/src \
+       -I/usr/X/include -DSWIG_GLOBAL -D__WXGTK__ \
+       # LFLAGS
+       -L$(WXWIN)/lib/solaris2.6 -L/usr/X/lib \
+       -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.6/2.8.1 \
+       -lwx_gtk -lgtk -lgdk -lglib -lXext -lX11 -lstdc++ -lgcc
+
+

 
 

-wxpc  wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
-      mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-      -I. -I$(WXWIN)/include -I/usr/lib/glib/include -I$(WXWIN)/src   \
-#      -D__WXDEBUG__  -ldmalloc                \
-      -DSWIG_GLOBAL -D__WXGTK__ -L$(WXWIN)/lib/Linux -lwx_gtk     \
-      -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11

 
 
 
 

diff --git a/utils/wxPython/src/gtk/wxp.cpp b/utils/wxPython/src/gtk/wxp.cpp
index cc027aaa224af7f63f39e123c5af17adde633c0e..28ecef3f8781bea30b40a9158418d243fc187a68 100644 (file)
--- a/utils/wxPython/src/gtk/wxp.cpp
+++ b/utils/wxPython/src/gtk/wxp.cpp
@@ -33,8 +33,8 @@
  * and things like that.
  *
  * $Log$
  * and things like that.
  *
  * $Log$

- * Revision 1.1  1998/08/19 00:10:01  RD
- * GTK version of the SWIG-generated files
+ * Revision 1.2  1998/08/22 19:50:56  RD
+ * some tweaks for wxGTK

  *
  ************************************************************************/
 
  *
  ************************************************************************/
 

diff --git a/utils/wxPython/src/gtk/wxp.py b/utils/wxPython/src/gtk/wxp.py
index 574861aac1919fdf4cae2be292fa7d3728c60ca2..72e5fe4f208e5a22ea4e1ee15d5b5ae81fe2c26e 100644 (file)
--- a/utils/wxPython/src/gtk/wxp.py
+++ b/utils/wxPython/src/gtk/wxp.py
@@ -1372,8 +1372,8 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

-# Revision 1.1  1998/08/19 00:10:03  RD
-# GTK version of the SWIG-generated files
+# Revision 1.2  1998/08/22 19:50:58  RD
+# some tweaks for wxGTK

 #
 # Revision 1.2  1998/08/18 19:48:12  RD
 # more wxGTK compatibility things.
 #
 # Revision 1.2  1998/08/18 19:48:12  RD
 # more wxGTK compatibility things.

diff --git a/utils/wxPython/tests/test3.py b/utils/wxPython/tests/test3.py
index c4502d35b75b009913100fc8959fec812005df64..39dba9b3bb05f8dc7a203a756cb4e9eb10e5f367 100644 (file)
--- a/utils/wxPython/tests/test3.py
+++ b/utils/wxPython/tests/test3.py
@@ -31,20 +31,21 @@ class MyCanvas(wxWindow):
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

-class MyMiniFrame(wxMiniFrame):
-    def __init__(self, parent, ID, title, pos, size, style):
-        wxMiniFrame.__init__(self, parent, ID, title, pos, size, style)
-        panel = wxPanel(self, -1)
-        ID = NewId()
-        button = wxButton(panel, ID, "Close Me")
-        button.SetPosition(wxPoint(15, 15))
-        self.Connect(ID, -1, wxEVT_COMMAND_BUTTON_CLICKED, self.OnCloseMe)
-
-    def OnCloseMe(self, event):
-        self.Close(true)
-
-    def OnCloseWindow(self, event):
-        self.Destroy()
+if wxPlatform == '__WXMSW__':
+    class MyMiniFrame(wxMiniFrame):
+        def __init__(self, parent, ID, title, pos, size, style):
+            wxMiniFrame.__init__(self, parent, ID, title, pos, size, style)
+            panel = wxPanel(self, -1)
+            ID = NewId()
+            button = wxButton(panel, ID, "Close Me")
+            button.SetPosition(wxPoint(15, 15))
+            self.Connect(ID, -1, wxEVT_COMMAND_BUTTON_CLICKED, self.OnCloseMe)
+
+        def OnCloseMe(self, event):
+            self.Close(true)
+
+        def OnCloseWindow(self, event):
+            self.Destroy()

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -62,10 +63,11 @@ class MyFrame(wxFrame):
         menu.Append(200, 'E&xit', 'Get the heck outta here!')
         mainmenu.Append(menu, "&It's a menu!")
         self.SetMenuBar(mainmenu)
         menu.Append(200, 'E&xit', 'Get the heck outta here!')
         mainmenu.Append(menu, "&It's a menu!")
         self.SetMenuBar(mainmenu)

-        print menu.GetHelpString(100)
-        print mainmenu.GetHelpString(101)
-        print mainmenu.GetHelpString(200)
-        self.DragAcceptFiles(true)
+        if wxPlatform == '__WXMSW__':
+            print menu.GetHelpString(100)
+            print mainmenu.GetHelpString(101)
+            print mainmenu.GetHelpString(200)
+            self.DragAcceptFiles(true)

 
         self.Connect(-1, -1, wxEVT_COMMAND_MENU_SELECTED, self.OnMenuCommand)
         self.Connect(-1, -1, wxEVT_DROP_FILES, self.OnDropFiles)
 
         self.Connect(-1, -1, wxEVT_COMMAND_MENU_SELECTED, self.OnMenuCommand)
         self.Connect(-1, -1, wxEVT_DROP_FILES, self.OnDropFiles)


@@ -93,13 +95,16 @@ class MyFrame(wxFrame):
         if event.GetInt() == 200:
             self.Close()
         elif event.GetInt() == 101:
         if event.GetInt() == 200:
             self.Close()
         elif event.GetInt() == 101:

-            win = MyMiniFrame(self, -1, "This is a Mini...",
+            if wxPlatform == '__WXMSW__':
+                win = MyMiniFrame(self, -1, "This is a Mini...",

                               wxPoint(-1, -1), #wxPyDefaultPosition,
                               wxSize(150, 150),
                               wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
                               wxTHICK_FRAME | wxSYSTEM_MENU |
                               wxTINY_CAPTION_HORIZ)
                               wxPoint(-1, -1), #wxPyDefaultPosition,
                               wxSize(150, 150),
                               wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
                               wxTHICK_FRAME | wxSYSTEM_MENU |
                               wxTINY_CAPTION_HORIZ)

-            win.Show(true)
+                win.Show(true)
+            else:
+                print 'Sorry, can\'t do mini\'s...'

 
 
 
 
 
 


@@ -138,6 +143,9 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.2  1998/08/22 19:51:17  RD
+# some tweaks for wxGTK
+#

 # Revision 1.1  1998/08/09 08:28:05  RD
 # Initial version
 #
 # Revision 1.1  1998/08/09 08:28:05  RD
 # Initial version
 #

diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py
index 33e38259a234e2d861205e5c2169ac0dd27dd3b3..358479be3ef61cec9836a522aa28be5bfab4d117 100644 (file)
--- a/utils/wxPython/tests/test4.py
+++ b/utils/wxPython/tests/test4.py
@@ -274,8 +274,9 @@ class AppFrame(wxFrame):
     def __init__(self, parent, id, title):
         wxFrame.__init__(self, parent, id, title, wxPyDefaultPosition,
                          wxSize(420, 200))
     def __init__(self, parent, id, title):
         wxFrame.__init__(self, parent, id, title, wxPyDefaultPosition,
                          wxSize(420, 200))

-        self.icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
-        self.SetIcon(self.icon)
+        if wxPlatform == '__WXMSW__':
+            self.icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
+            self.SetIcon(self.icon)

 
         self.mainmenu = wxMenuBar()
         menu = wxMenu()
 
         self.mainmenu = wxMenuBar()
         menu = wxMenu()


@@ -384,9 +385,8 @@ class AppFrame(wxFrame):
 
     def OnTestSimpleControls(self, event):
         dlg = TestSimpleControlsDlg(self, self)
 
     def OnTestSimpleControls(self, event):
         dlg = TestSimpleControlsDlg(self, self)

-        dlg.SetModal(true)

         dlg.Centre()
         dlg.Centre()

-        dlg.Show(true)
+        dlg.ShowModal()

         dlg.Destroy()
 
     def OnTestTimer(self, event):
         dlg.Destroy()
 
     def OnTestTimer(self, event):


@@ -520,6 +520,9 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.2  1998/08/22 19:51:18  RD
+# some tweaks for wxGTK
+#

 # Revision 1.1  1998/08/09 08:28:05  RD
 # Initial version
 #
 # Revision 1.1  1998/08/09 08:28:05  RD
 # Initial version
 #