X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cd2fac87f47fa01633ab9430d05c0a659325305..873fb06d2abb91b5ab9168d9ba333b2423d12c14:/wxPython/src/gtk/controls.cpp diff --git a/wxPython/src/gtk/controls.cpp b/wxPython/src/gtk/controls.cpp index af1424f8aa..d1a116fb29 100644 --- a/wxPython/src/gtk/controls.cpp +++ b/wxPython/src/gtk/controls.cpp @@ -27,21 +27,19 @@ # define SWIGEXPORT(a) __declspec(dllexport) a # else # if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export +# define SWIGEXPORT(a) a _export # else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a # endif # endif #else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a #endif -#include "Python.h" - #ifdef __cplusplus extern "C" { #endif - +#include "Python.h" extern void SWIG_MakePtr(char *, void *, char *); extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *)); extern char *SWIG_GetPtr(char *, void **, char *); @@ -122,8 +120,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { static char* wxStringErrorMsg = "string type is required for parameter"; -wxValidator wxPyDefaultValidator; // Non-const default because of SWIG - wxSize wxButton_GetDefaultSize() { return wxButton::GetDefaultSize(); } @@ -186,10 +182,10 @@ static PyObject *_wrap_new_wxControl(PyObject *self, PyObject *args, PyObject *k wxControl * _result; wxWindow * _arg0; wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; long _arg4 = (long ) 0; - wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator; char * _arg6 = (char *) "control"; PyObject * _argo0 = 0; wxPoint temp; @@ -394,10 +390,10 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args, PyObject *kw wxWindow * _arg0; wxWindowID _arg1; wxString * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) 0; - wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator; char * _arg7 = (char *) "button"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; @@ -611,10 +607,10 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args, PyObje wxWindow * _arg0; wxWindowID _arg1; wxBitmap * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) wxBU_AUTODRAW; - wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator; char * _arg7 = (char *) "button"; PyObject * _argo0 = 0; PyObject * _argo2 = 0; @@ -1075,10 +1071,10 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject * wxWindow * _arg0; wxWindowID _arg1; wxString * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) 0; - wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator; char * _arg7 = (char *) "checkBox"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; @@ -1243,12 +1239,12 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kw wxChoice * _result; wxWindow * _arg0; wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; int _arg4 = (int ) 0; wxString * _arg5 = (wxString *) NULL; long _arg6 = (long ) 0; - wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator; char * _arg8 = (char *) "choice"; PyObject * _argo0 = 0; wxPoint temp; @@ -1743,12 +1739,12 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject * wxWindow * _arg0; wxWindowID _arg1; char * _arg2 = (char *) ""; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; int _arg5 = (int ) 0; wxString * _arg6 = (wxString *) NULL; long _arg7 = (long ) 0; - wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg8 = (wxValidator *) &wxDefaultValidator; char * _arg9 = (char *) "comboBox"; PyObject * _argo0 = 0; wxPoint temp; @@ -2541,10 +2537,10 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args, PyObject *kwa wxWindow * _arg0; wxWindowID _arg1; int _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) wxGA_HORIZONTAL; - wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator; char * _arg7 = (char *) "gauge"; PyObject * _argo0 = 0; wxPoint temp; @@ -2850,8 +2846,8 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args, PyObject wxWindow * _arg0; wxWindowID _arg1; wxString * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) 0; char * _arg6 = (char *) "staticBox"; PyObject * _argo0 = 0; @@ -2952,8 +2948,8 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject wxStaticLine * _result; wxWindow * _arg0; wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; long _arg4 = (long ) wxLI_HORIZONTAL; char * _arg5 = (char *) "staticLine"; PyObject * _argo0 = 0; @@ -3032,8 +3028,8 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject wxWindow * _arg0; wxWindowID _arg1; wxString * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) 0; char * _arg6 = (char *) "staticText"; PyObject * _argo0 = 0; @@ -3217,12 +3213,12 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *k wxListBox * _result; wxWindow * _arg0; wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; int _arg4; wxString * _arg5 = (wxString *) NULL; long _arg6 = (long ) 0; - wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator; char * _arg8 = (char *) "listBox"; PyObject * _argo0 = 0; wxPoint temp; @@ -4015,12 +4011,12 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObje wxCheckListBox * _result; wxWindow * _arg0; wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; int _arg4 = (int ) 0; wxString * _arg5 = (wxString *) NULL; long _arg6 = (long ) 0; - wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator; char * _arg8 = (char *) "listBox"; PyObject * _argo0 = 0; wxPoint temp; @@ -4257,10 +4253,10 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args, PyObject * wxWindow * _arg0; wxWindowID _arg1; char * _arg2 = (char *) ""; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) 0; - wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator; char * _arg7 = (char *) "text"; PyObject * _argo0 = 0; wxPoint temp; @@ -5553,10 +5549,10 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args, PyObject wxScrollBar * _result; wxWindow * _arg0; wxWindowID _arg1 = (wxWindowID ) -1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; long _arg4 = (long ) wxSB_HORIZONTAL; - wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator; char * _arg6 = (char *) "scrollBar"; PyObject * _argo0 = 0; wxPoint temp; @@ -5811,8 +5807,8 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args, PyObject wxSpinButton * _result; wxWindow * _arg0; wxWindowID _arg1 = (wxWindowID ) -1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; long _arg4 = (long ) wxSP_HORIZONTAL; char * _arg5 = (char *) "spinButton"; PyObject * _argo0 = 0; @@ -6029,8 +6025,8 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObje wxWindow * _arg0; wxWindowID _arg1; wxBitmap * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) 0; char * _arg6 = (char *) "staticBitmap"; PyObject * _argo0 = 0; @@ -6224,13 +6220,13 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject * wxWindow * _arg0; wxWindowID _arg1; wxString * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; int _arg5 = (int ) 0; wxString * _arg6 = (wxString *) NULL; int _arg7 = (int ) 0; long _arg8 = (long ) wxRA_HORIZONTAL; - wxValidator * _arg9 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg9 = (wxValidator *) &wxDefaultValidator; char * _arg10 = (char *) "radioBox"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; @@ -6814,10 +6810,10 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args, PyObjec wxWindow * _arg0; wxWindowID _arg1; wxString * _arg2; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) 0; - wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator; char * _arg7 = (char *) "radioButton"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; @@ -6985,10 +6981,10 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args, PyObject *kw int _arg2; int _arg3; int _arg4; - wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg6 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg6 = (wxSize *) &wxDefaultSize; long _arg7 = (long ) wxSL_HORIZONTAL; - wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator; + wxValidator * _arg8 = (wxValidator *) &wxDefaultValidator; char * _arg9 = (char *) "slider"; PyObject * _argo0 = 0; wxPoint temp; @@ -7606,8 +7602,8 @@ static PyObject *_wrap_new_wxSpinCtrl(PyObject *self, PyObject *args, PyObject * wxWindow * _arg0; wxWindowID _arg1 = (wxWindowID ) -1; char * _arg2 = (char *) ""; - wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; long _arg5 = (long ) wxSP_ARROW_KEYS; int _arg6 = (int ) 0; int _arg7 = (int ) 100;