Tweaks needed to be able to build wxPython with wxGTK.

[wxWidgets.git] / utils / wxPython / src / stattool.i

diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i
index a1420b4c807c98618cc392d3a230f4414fc3071b..e68fccaf47d95fd9454fd44bb7a4a9750e9796ed 100644 (file)
--- a/utils/wxPython/src/stattool.i
+++ b/utils/wxPython/src/stattool.i
@@ -30,6 +30,7 @@
 %import windows.i
 %import controls.i
 
 %import windows.i
 %import controls.i
 

+%pragma(python) code = "import wx"

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -41,7 +42,7 @@ public:
                 long style = wxST_SIZEGRIP,
                 char* name = "statusBar");
 
                 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) {
 
     %addmethods {
         %new wxRect* GetFieldRect(long item) {


@@ -70,18 +71,22 @@ class wxToolBarTool {
 public:
     wxToolBarTool();
     ~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; }
     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;
 
 public:
     int                   m_toolStyle;
     wxObject *            m_clientData;
     int                   m_index;

+#ifdef __WXMSW__

     long                  m_x;
     long                  m_y;
     long                  m_width;
     long                  m_height;
     long                  m_x;
     long                  m_y;
     long                  m_width;
     long                  m_height;

+#endif

     bool                  m_toggleState;
     bool                  m_isToggle;
     bool                  m_deleteSecondBitmap;
     bool                  m_toggleState;
     bool                  m_isToggle;
     bool                  m_deleteSecondBitmap;


@@ -95,8 +100,18 @@ public:
 
 
 
 
 
 

-class wxToolBarBase : public wxControl {
+//  class wxToolBarBase : public wxControl {
+//  public:
+
+class wxToolBar : public wxControl {

 public:
 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(void);


@@ -120,17 +135,21 @@ public:
 
 //    void DrawTool(wxMemoryDC& memDC, wxToolBarTool* tool);
     void EnableTool(int toolIndex, const bool enable);
 
 //    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();
 //    wxSize GetMargins();
     wxSize GetMaxSize();
 //    wxObject* GetToolClientData(int toolIndex);
     wxToolBarTool* FindToolForPosition(const float x, const float y);
     wxSize GetToolSize();
     wxSize GetToolBitmapSize();
 //    wxSize GetMargins();
     wxSize GetMaxSize();
 //    wxObject* GetToolClientData(int toolIndex);

+#endif

     bool GetToolEnabled(int toolIndex);
     bool GetToolEnabled(int toolIndex);

+#ifdef __WXMSW__

     wxString GetToolLongHelp(int toolIndex);
     int GetToolPacking();
     int GetToolSeparation();
     wxString GetToolShortHelp(int toolIndex);
     wxString GetToolLongHelp(int toolIndex);
     int GetToolPacking();
     int GetToolSeparation();
     wxString GetToolShortHelp(int toolIndex);

+#endif

     bool GetToolState(int toolIndex);
 
     // TODO:  figure out how to handle these
     bool GetToolState(int toolIndex);
 
     // TODO:  figure out how to handle these


@@ -138,44 +157,51 @@ public:
     //void OnMouseEnter(int toolIndex);
     //void OnRightClick(int toolIndex, float x, float y);
 
     //void OnMouseEnter(int toolIndex);
     //void OnRightClick(int toolIndex, float x, float y);
 

+
+#ifdef __WXMSW__

     bool Realize();
     bool Realize();

+#else
+    void Realize();
+#endif
+#ifdef __WXMSW__

     void SetToolBitmapSize(const wxSize& size);
     void SetToolBitmapSize(const wxSize& size);

-    void SetMargins(const wxSize& size);

     void SetToolLongHelp(int toolIndex, const wxString& helpString);
     void SetToolLongHelp(int toolIndex, const wxString& helpString);

-    void SetToolPacking(int packing);

     void SetToolShortHelp(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);
     void ToggleTool(int toolIndex, const bool toggle);
 };
 
 
 
     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");
+//  // 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)"
+//      %pragma(python) addtomethod = "__init__:wx._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");
+//  // 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)"
+//      %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"

 
 

-};
+//  };

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -183,7 +209,30 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// 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
 // Revision 1.1  1998/10/02 06:40:42  RD

+//

 // Version 0.4 of wxPython for MSW.
 //
 //
 // Version 0.4 of wxPython for MSW.
 //
 //