X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b26e2dc41d9f5b387897a6cc6fba58d6957fd5cd..4a1acb45b0fd4bd7fa4a318f77b912cfccc56931:/utils/wxPython/src/stattool.i

diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i
index 82f1cb9680..f28a74f802 100644
--- a/utils/wxPython/src/stattool.i
+++ b/utils/wxPython/src/stattool.i
@@ -30,6 +30,7 @@
 %import windows.i
 %import controls.i
 
+%pragma(python) code = "import wx"
 
 //---------------------------------------------------------------------------
 
@@ -41,7 +42,7 @@ public:
                 long style = wxST_SIZEGRIP,
                 char* name = "statusBar");
 
-    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     %addmethods {
         %new wxRect* GetFieldRect(long item) {
@@ -110,7 +111,7 @@ public:
               long style = wxTB_HORIZONTAL | wxNO_BORDER,
               char* name = "toolBar");
 
-    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
 
     void AddSeparator(void);
@@ -138,17 +139,16 @@ public:
     wxToolBarTool* FindToolForPosition(const float x, const float y);
     wxSize GetToolSize();
     wxSize GetToolBitmapSize();
+    void SetToolBitmapSize(const wxSize& size);
 //    wxSize GetMargins();
     wxSize GetMaxSize();
 //    wxObject* GetToolClientData(int toolIndex);
 #endif
     bool GetToolEnabled(int toolIndex);
-#ifdef __WXMSW__
     wxString GetToolLongHelp(int toolIndex);
     int GetToolPacking();
     int GetToolSeparation();
     wxString GetToolShortHelp(int toolIndex);
-#endif
     bool GetToolState(int toolIndex);
 
     // TODO:  figure out how to handle these
@@ -156,17 +156,10 @@ public:
     //void OnMouseEnter(int toolIndex);
     //void OnRightClick(int toolIndex, float x, float y);
 
-
-#ifdef __WXMSW__
     bool Realize();
-#else
-    void Realize();
-#endif
-#ifdef __WXMSW__
-    void SetToolBitmapSize(const wxSize& size);
+    
     void SetToolLongHelp(int toolIndex, const wxString& helpString);
     void SetToolShortHelp(int toolIndex, const wxString& helpString);
-#endif
     void SetMargins(const wxSize& size);
     void SetToolPacking(int packing);
     void SetToolSeparation(int separation);
@@ -184,7 +177,7 @@ public:
 //                long style = wxTB_HORIZONTAL | wxNO_BORDER,
 //                char* name = "toolBar");
 
-//      %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+//      %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
 //  };
 
@@ -198,7 +191,7 @@ public:
 //                      long style = wxTB_HORIZONTAL | wxNO_BORDER,
 //                      char* name = "toolBar");
 
-//      %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+//      %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
 //  };
 
@@ -208,6 +201,28 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/12/17 14:07:43  RR
+//   Removed minor differences between wxMSW and wxGTK
+//
+// Revision 1.3  1998/12/15 20:41:23  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.
+//
 // Revision 1.2  1998/10/07 07:34:34  RD
 // Version 0.4.1 for wxGTK
 //