X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c039d08bfbb59c0abcbc705fb49f9b2cb321edf..984ef9dce7bcc69881176a89c5fe8a80511ea58c:/utils/wxPython/src/frames.i?ds=inline

diff --git a/utils/wxPython/src/frames.i b/utils/wxPython/src/frames.i
index 5dc589fff7..7cea8d68a1 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");
 
@@ -66,14 +63,12 @@ public:
     void Iconize(bool iconize);
     bool IsIconized();
     void Maximize(bool maximize);
-#ifdef __WXMSW__
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
-#endif
     void SetIcon(const wxIcon& icon);
     void SetMenuBar(wxMenuBar* menuBar);
     void SetStatusBar(wxStatusBar *statusBar);
     void SetStatusText(const wxString& text, int number = 0);
-    void SetStatusWidths(int LCOUNT, int* LIST); // uses typemap
+    void SetStatusWidths(int LCOUNT, int* choices); // uses typemap
     void SetTitle(const wxString& title);
     void SetToolBar(wxToolBar* toolbar);
 
@@ -81,7 +76,6 @@ public:
 
 //---------------------------------------------------------------------------
 
-#ifdef __WXMSW__
 class wxMiniFrame : public wxFrame {
 public:
     wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
@@ -90,7 +84,13 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 char* name = "frame");
 
-    %pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
 };
-#endif
+
+
+//---------------------------------------------------------------------------
+
+
+
+