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

diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i
index a1420b4c80..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) {
@@ -70,18 +71,22 @@ class wxToolBarTool {
 public:
     wxToolBarTool();
     ~wxToolBarTool();
+#ifdef __WXMSW__
     void SetSize( long w, long h ) { m_width = w; m_height = h; }
     long GetWidth () const { return m_width; }
     long GetHeight () const { return m_height; }
+#endif
 
 public:
     int                   m_toolStyle;
     wxObject *            m_clientData;
     int                   m_index;
+#ifdef __WXMSW__
     long                  m_x;
     long                  m_y;
     long                  m_width;
     long                  m_height;
+#endif
     bool                  m_toggleState;
     bool                  m_isToggle;
     bool                  m_deleteSecondBitmap;
@@ -95,11 +100,21 @@ public:
 
 
 
-class wxToolBarBase : public wxControl {
+//  class wxToolBarBase : public wxControl {
+//  public:
+
+class wxToolBar : public wxControl {
 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__:wx._StdWindowCallbacks(self)"
 
 
-    void AddSeparator(void);
+    void AddSeparator();
 
     // Ignoge the clientData for now...
     %addmethods {
@@ -116,16 +131,29 @@ 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);
     wxString GetToolLongHelp(int toolIndex);
     int GetToolPacking();
@@ -139,51 +167,61 @@ public:
     //void OnRightClick(int toolIndex, float x, float y);
 
     bool Realize();
-    void SetToolBitmapSize(const wxSize& size);
-    void SetMargins(const wxSize& size);
+
     void SetToolLongHelp(int toolIndex, const wxString& helpString);
-    void SetToolPacking(int packing);
     void SetToolShortHelp(int toolIndex, const wxString& helpString);
+    void SetMargins(const wxSize& size);
+    void SetToolPacking(int packing);
     void SetToolSeparation(int separation);
     void ToggleTool(int toolIndex, const bool toggle);
 };
 
 
 
-// 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
+//
 // Revision 1.1  1998/10/02 06:40:42  RD
+//
 // Version 0.4 of wxPython for MSW.
 //
 //