More updates to wxWindow, wxMenu, GdiImage to get minimal to work

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

diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i
index c8987504ba73636a6d5b13917bf2220bbdf3e721..575f8880b5413e23ed5700f9c15fb59541cc859a 100644 (file)
--- a/utils/wxPython/src/stattool.i
+++ b/utils/wxPython/src/stattool.i
@@ -53,13 +53,17 @@ public:
     }
     int GetFieldsCount(void);
     wxString GetStatusText(int ir = 0);
-    void DrawField(wxDC& dc, int i);
-    void DrawFieldText(wxDC& dc, int i);
-    void InitColours(void);
+    int GetBorderX();
+    int GetBorderY();
+
+//      void DrawField(wxDC& dc, int i);
+//      void DrawFieldText(wxDC& dc, int i);
+//      void InitColours(void);
 
     void SetFieldsCount(int number = 1);
     void SetStatusText(const wxString& text, int i = 0);
-    void SetStatusWidths(int LCOUNT, int* LIST);
+    void SetStatusWidths(int LCOUNT, int* choices);
+    void SetMinHeight(int height);
 };
 
 
@@ -272,7 +276,7 @@ public:
               const wxPoint& pos = wxPyDefaultPosition,
               const wxSize& size = wxPyDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
-              const wxString& name = wxToolBarNameStr);
+              const char* name = wxToolBarNameStr);
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
@@ -289,7 +293,7 @@ public:
                     const wxPoint& pos = wxPyDefaultPosition,
                     const wxSize& size = wxPyDefaultSize,
                     long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                    const wxString& name = wxToolBarNameStr);
+                    const char* name = wxToolBarNameStr);
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"