X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/faf3cb3590e7bead27735c94014df39025cfc12b..d9f39e09e82e99c422619f4e3df536d0a9e87987:/utils/wxPython/src/frames.i

diff --git a/utils/wxPython/src/frames.i b/utils/wxPython/src/frames.i
index 8fa8ee5416..69d76332b1 100644
--- a/utils/wxPython/src/frames.i
+++ b/utils/wxPython/src/frames.i
@@ -15,10 +15,7 @@
 
 %{
 #include "helpers.h"
-
-#ifdef __WXMSW__
 #include <wx/minifram.h>
-#endif
 %}
 
 //----------------------------------------------------------------------
@@ -33,7 +30,7 @@
 %import windows.i
 %import stattool.i
 
-%pragma(python) code = "import wxp"
+%pragma(python) code = "import wx"
 
 //----------------------------------------------------------------------
 
@@ -45,7 +42,7 @@ public:
             long style = wxDEFAULT_FRAME_STYLE,
             char* name = "frame");
 
-    %pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
 
     void Centre(int direction = wxBOTH);
 #ifdef __WXMSW__
@@ -55,7 +52,7 @@ public:
                                  long style = wxST_SIZEGRIP,
                                  wxWindowID id = -1,
                                  char* name = "statusBar");
-    wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
+    wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT,
                              wxWindowID id = -1,
                              char* name = "toolBar");
 
@@ -79,7 +76,6 @@ public:
 
 //---------------------------------------------------------------------------
 
-#ifdef __WXMSW__
 class wxMiniFrame : public wxFrame {
 public:
     wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
@@ -88,7 +84,39 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 char* name = "frame");
 
-    %pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
 };
-#endif
+
+
+//---------------------------------------------------------------------------
+/////////////////////////////////////////////////////////////////////////////
+//
+// $Log$
+// Revision 1.4  1998/12/16 22:10:53  RD
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
+// Revision 1.3  1998/12/15 20:41:18  RD
+// Changed the import semantics from "from wxPython import *" to "from
+// wxPython.wx import *"  This is for people who are worried about
+// namespace pollution, they can use "from wxPython import wx" and then
+// prefix all the wxPython identifiers with "wx."
+//
+// Added wxTaskbarIcon for wxMSW.
+//
+// Made the events work for wxGrid.
+//
+// Added wxConfig.
+//
+// Added wxMiniFrame for wxGTK, (untested.)
+//
+// Changed many of the args and return values that were pointers to gdi
+// objects to references to reflect changes in the wxWindows API.
+//
+// Other assorted fixes and additions.
+//
+
+
+
+
+