hopefully fixes focus assertion

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

diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i
index 03a28cfb5e06996aa4117394a8d244c55dc33319..1a6482b228da9333e714956a9d34a4c04c0cae79 100644 (file)
--- a/wxPython/src/stattool.i
+++ b/wxPython/src/stattool.i
@@ -46,6 +46,11 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxST_SIZEGRIP,
                 char* name = "statusBar");
                 const wxSize& size = wxDefaultSize,
                 long style = wxST_SIZEGRIP,
                 char* name = "statusBar");

+    %name(wxPreStatusBar)wxStatusBar();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+                long style = wxST_SIZEGRIP,
+                char* name = "statusBar");

 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
 


@@ -61,10 +66,6 @@ public:
     int GetBorderX();
     int GetBorderY();
 
     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* choices);
     void SetFieldsCount(int number = 1);
     void SetStatusText(const wxString& text, int i = 0);
     void SetStatusWidths(int LCOUNT, int* choices);


@@ -283,6 +284,14 @@ public:
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const char* name = wxToolBarNameStr);
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const char* name = wxToolBarNameStr);

+    %name(wxPreToolBar)wxToolBar();
+
+    bool Create(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxNO_BORDER | wxTB_HORIZONTAL,
+              const char* name = wxToolBarNameStr);

 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
 


@@ -300,6 +309,14 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = wxNO_BORDER | wxTB_HORIZONTAL,
                     const char* name = wxToolBarNameStr);
                     const wxSize& size = wxDefaultSize,
                     long style = wxNO_BORDER | wxTB_HORIZONTAL,
                     const char* name = wxToolBarNameStr);

+    %name(wxPreToolBarSimple)wxToolBarSimple();
+
+    bool Create(wxWindow *parent,
+                    wxWindowID id,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                    const char* name = wxToolBarNameStr);

 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"