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

diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i
index 82f1cb9680..53fd289193 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,10 +111,10 @@ 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);
+    void AddSeparator();
 
     // Ignoge the clientData for now...
     %addmethods {
@@ -130,25 +131,34 @@ public:
                                  isToggle, xPos, yPos, NULL,
                                  shortHelpString, longHelpString);
         }
+
+        wxToolBarTool* AddSimpleTool(int toolIndex,
+                               const wxBitmap& bitmap,
+                               const wxString& shortHelpString = wxPyEmptyStr,
+                               const wxString& longHelpString = wxPyEmptyStr) {
+            return self->AddTool(toolIndex, bitmap, wxNullBitmap,
+                                 FALSE, -1, -1, NULL,
+                                 shortHelpString, longHelpString);
+        }
     }
 
+
 //    void DrawTool(wxMemoryDC& memDC, wxToolBarTool* tool);
     void EnableTool(int toolIndex, const bool enable);
 #ifdef __WXMSW__
     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 +166,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);
@@ -175,39 +178,45 @@ public:
 
 
 
-//  // The Native Toolbar
-//  class wxToolBar : public wxToolBarBase {
-//  public:
-//      wxToolBar(wxWindow* parent, wxWindowID id,
-//                const wxPoint& pos = wxPyDefaultPosition,
-//                const wxSize& size = wxPyDefaultSize,
-//                long style = wxTB_HORIZONTAL | wxNO_BORDER,
-//                char* name = "toolBar");
-
-//      %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
-
-//  };
-
-
-//  // A generic toolbar
-//  class wxToolBarSimple : public wxToolBarBase {
-//  public:
-//      wxToolBarSimple(wxWindow* parent, wxWindowID id,
-//                      const wxPoint& pos = wxPyDefaultPosition,
-//                      const wxSize& size = wxPyDefaultSize,
-//                      long style = wxTB_HORIZONTAL | wxNO_BORDER,
-//                      char* name = "toolBar");
-
-//      %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
-
-//  };
-
 
 //---------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.6  1999/02/25 07:08:35  RD
+// wxPython version 2.0b5
+//
+// Revision 1.5  1999/01/30 07:30:15  RD
+//
+// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+//
+// Various cleanup, tweaks, minor additions, etc. to maintain
+// compatibility with the current wxWindows.
+//
+// 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
 //