Fixed compilation error

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 73d21cf13dcde7424ec4570eb0c8b224c5be5a68..b895044611972d27c57985cdcb49b356374a91cd 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -64,8 +64,16 @@ public:
                        long style=0,
                        const wxValidator& validator=wxDefaultValidator,
                        const char* name="control");
                        long style=0,
                        const wxValidator& validator=wxDefaultValidator,
                        const char* name="control");

+    %name(wxPreControl)wxControl();
+
+    bool Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos=wxDefaultPosition,
+                       const wxSize& size=wxDefaultSize,
+                       long style=0,
+                       const wxValidator& validator=wxDefaultValidator,
+                       const char* name="control");

 
 

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

 
     void Command(wxCommandEvent& event);
     wxString GetLabel();
 
     void Command(wxCommandEvent& event);
     wxString GetLabel();


@@ -83,21 +91,26 @@ public:
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              char* name = "button");
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              char* name = "button");

+    %name(wxPreButton)wxButton();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             char* name = "button");

 
 

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

 
     void SetDefault();
     void SetBackgroundColour(const wxColour& colour);
     void SetForegroundColour(const wxColour& colour);
 
     void SetDefault();
     void SetBackgroundColour(const wxColour& colour);
     void SetForegroundColour(const wxColour& colour);

+#ifdef __WXMSW__
+    void SetImageLabel(const wxBitmap& bitmap);
+    void SetImageMargins(wxCoord x, wxCoord y);
+#endif
+    static wxSize GetDefaultSize();

 };
 
 };
 

-
-%inline %{
-    wxSize wxButton_GetDefaultSize() {
-        return wxButton::GetDefaultSize();
-    }
-%}
-

 //----------------------------------------------------------------------
 
 class wxBitmapButton : public wxButton {
 //----------------------------------------------------------------------
 
 class wxBitmapButton : public wxButton {


@@ -108,8 +121,15 @@ public:
                    long style = wxBU_AUTODRAW,
                    const wxValidator& validator = wxDefaultValidator,
                    char* name = "button");
                    long style = wxBU_AUTODRAW,
                    const wxValidator& validator = wxDefaultValidator,
                    char* name = "button");

+    %name(wxPreBitmapButton)wxBitmapButton();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxBU_AUTODRAW,
+                   const wxValidator& validator = wxDefaultValidator,
+                   char* name = "button");

 
 

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

 
     wxBitmap& GetBitmapLabel();
     wxBitmap& GetBitmapDisabled();
 
     wxBitmap& GetBitmapLabel();
     wxBitmap& GetBitmapDisabled();


@@ -135,8 +155,15 @@ public:
                long style = 0,
                const wxValidator& val = wxDefaultValidator,
                char* name = "checkBox");
                long style = 0,
                const wxValidator& val = wxDefaultValidator,
                char* name = "checkBox");

+    %name(wxPreCheckBox)wxCheckBox();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& val = wxDefaultValidator,
+               char* name = "checkBox");

 
 

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

 
     bool GetValue();
     void SetValue(const bool state);
 
     bool GetValue();
     void SetValue(const bool state);


@@ -153,8 +180,16 @@ public:
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              char* name = "choice");
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              char* name = "choice");

+    %name(wxPreChoice)wxChoice();
+
+    bool Create(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             int LCOUNT=0, wxString* choices=NULL,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             char* name = "choice");

 
 

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

 
     void Append(const wxString& item);
     void Clear();
 
     void Append(const wxString& item);
     void Clear();


@@ -188,8 +223,16 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "comboBox");
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "comboBox");

+    %name(wxPreComboBox)wxComboBox();
+
+    bool Create(wxWindow* parent, wxWindowID id, char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int LCOUNT=0, wxString* choices=NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "comboBox");

 
 

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

 
     void Append(const wxString& item);
     // TODO: void Append(const wxString& item, char* clientData);
 
     void Append(const wxString& item);
     // TODO: void Append(const wxString& item, char* clientData);


@@ -228,8 +271,15 @@ public:
             long style = wxGA_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
             char* name = "gauge");
             long style = wxGA_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
             char* name = "gauge");

+    %name(wxPreGauge)wxGauge();
+
+    bool Create(wxWindow* parent, wxWindowID id, int range,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxGA_HORIZONTAL,
+            const wxValidator& validator = wxDefaultValidator,
+            char* name = "gauge");

 
 

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

 
     int GetBezelFace();
     int GetRange();
 
     int GetBezelFace();
     int GetRange();


@@ -250,6 +300,13 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 char* name = "staticBox");
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 char* name = "staticBox");

+    %name(wxPreStaticBox)wxStaticBox();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                char* name = "staticBox");

 };
 
 
 };
 
 


@@ -263,6 +320,13 @@ public:
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const char* name = "staticLine" );
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const char* name = "staticLine" );

+    %name(wxPreStaticLine)wxStaticLine();
+
+    bool Create( wxWindow *parent, wxWindowID id,
+                  const wxPoint &pos = wxDefaultPosition,
+                  const wxSize &size = wxDefaultSize,
+                  long style = wxLI_HORIZONTAL,
+                  const char* name = "staticLine" );

 };
 
 
 };
 
 


@@ -275,8 +339,14 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  char* name = "staticText");
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  char* name = "staticText");

+    %name(wxPreStaticText)wxStaticText();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 char* name = "staticText");

 
 

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

 
     wxString GetLabel();
     void SetLabel(const wxString& label);
 
     wxString GetLabel();
     void SetLabel(const wxString& label);


@@ -293,8 +363,16 @@ public:
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
               char* name = "listBox");
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
               char* name = "listBox");

+    %name(wxPreListBox)wxListBox();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              int LCOUNT, wxString* choices = NULL,
+              long style = 0,
+              const wxValidator& validator = wxDefaultValidator,
+              char* name = "listBox");

 
 

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

 
     void Append(const wxString& item);
     // TODO:    void Append(const wxString& item, char* clientData);
 
     void Append(const wxString& item);
     // TODO:    void Append(const wxString& item, char* clientData);


@@ -348,8 +426,17 @@ public:
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    char* name = "listBox");
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    char* name = "listBox");

+    %name(wxPreCheckListBox)wxCheckListBox();
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   int LCOUNT = 0,
+                   wxString* choices = NULL,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   char* name = "listBox");

 
 

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

 
     bool  IsChecked(int uiIndex);
     void  Check(int uiIndex, int bCheck = TRUE);
 
     bool  IsChecked(int uiIndex);
     void  Check(int uiIndex, int bCheck = TRUE);


@@ -395,8 +482,15 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "text");
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "text");

+    %name(wxPreTextCtrl)wxTextCtrl();
+
+    bool Create(wxWindow* parent, wxWindowID id, char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "text");

 
 

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

 
     void Clear();
     void Copy();
 
     void Clear();
     void Copy();


@@ -458,8 +552,15 @@ public:
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
                 char* name = "scrollBar");
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
                 char* name = "scrollBar");

+    %name(wxPreScrollBar)wxScrollBar();
+
+    bool Create(wxWindow* parent, wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSB_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                char* name = "scrollBar");

 
 

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

 
     int GetRange();
     int GetPageSize();
 
     int GetRange();
     int GetPageSize();


@@ -481,6 +582,13 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = wxSP_HORIZONTAL,
                  char* name = "spinButton");
                  const wxSize& size = wxDefaultSize,
                  long style = wxSP_HORIZONTAL,
                  char* name = "spinButton");

+    %name(wxPreSpinButton)wxSpinButton();
+
+    bool Create(wxWindow* parent, wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxSP_HORIZONTAL,
+                 char* name = "spinButton");

 
     int GetMax();
     int GetMin();
 
     int GetMax();
     int GetMin();


@@ -499,8 +607,15 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    char* name = "staticBitmap");
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    char* name = "staticBitmap");

+    %name(wxPreStaticBitmap)wxStaticBitmap();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+                   const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   char* name = "staticBitmap");

 
 

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

 
     const wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
 
     const wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);


@@ -520,8 +635,18 @@ public:
                long style = wxRA_HORIZONTAL,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "radioBox");
                long style = wxRA_HORIZONTAL,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "radioBox");

+    %name(wxPreRadioBox)wxRadioBox();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+               const wxString& label,
+               const wxPoint& point = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int LCOUNT = 0, wxString* choices = NULL,
+               int majorDimension = 0,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "radioBox");

 
 

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

 
     void Enable(bool enable);
     %name(EnableItem)void Enable(int n, bool enable);
 
     void Enable(bool enable);
     %name(EnableItem)void Enable(int n, bool enable);


@@ -564,8 +689,16 @@ public:
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
                   char* name = "radioButton");
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
                   char* name = "radioButton");

+    %name(wxPreRadioButton)wxRadioButton();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+                  const wxString& label,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,
+                  long style = 0,
+                  const wxValidator& validator = wxDefaultValidator,
+                  char* name = "radioButton");

 
 

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

 
     bool GetValue();
     void SetValue(bool value);
 
     bool GetValue();
     void SetValue(bool value);


@@ -582,8 +715,16 @@ public:
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
              char* name = "slider");
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
              char* name = "slider");

+    %name(wxPreSlider)wxSlider();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+             int value, int minValue, int maxValue,
+             const wxPoint& point = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxSL_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             char* name = "slider");

 
 

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

 
     void ClearSel();
     void ClearTicks();
 
     void ClearSel();
     void ClearTicks();


@@ -619,6 +760,16 @@ public:
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const char* name = "wxSpinCtrl");
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const char* name = "wxSpinCtrl");

+    %name(wxPreSpinCtrl)wxSpinCtrl();
+
+    bool Create(wxWindow *parent,
+               wxWindowID id = -1,
+               const char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxSP_ARROW_KEYS,
+               int min = 0, int max = 100, int initial = 0,
+               const char* name = "wxSpinCtrl");

 
 
     int GetMax();
 
 
     int GetMax();


@@ -644,6 +795,16 @@ public:
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const char* name = "toggle");
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const char* name = "toggle");

+    %name(wxPreToggleButton)wxToggleButton();
+
+    bool Create(wxWindow *parent,
+                   wxWindowID id,
+                   const wxString& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const char* name = "toggle");

 
     void SetValue(bool value);
     bool GetValue() const ;
 
     void SetValue(bool value);
     bool GetValue() const ;