Added patch to wxPoint_LIST_helper from Tim Hochberg that should make

[wxWidgets.git] / wxPython / src / gtk / cmndlgs.cpp

diff --git a/wxPython/src/gtk/cmndlgs.cpp b/wxPython/src/gtk/cmndlgs.cpp
index 0ebd9465e7414878e33137c431dc4f6f67faf87f..37f0e0c50471a8f2251ea6f6d0388e8f88e670c7 100644 (file)
--- a/wxPython/src/gtk/cmndlgs.cpp
+++ b/wxPython/src/gtk/cmndlgs.cpp
@@ -27,21 +27,19 @@
 #      define SWIGEXPORT(a) __declspec(dllexport) a
 #   else
 #      if defined(__BORLANDC__)
 #      define SWIGEXPORT(a) __declspec(dllexport) a
 #   else
 #      if defined(__BORLANDC__)

-#          define SWIGEXPORT(a) a _export
+#          define SWIGEXPORT(a) a _export 

 #      else
 #      else

-#          define SWIGEXPORT(a) a
+#          define SWIGEXPORT(a) a 

 #      endif
 #   endif
 #else
 #      endif
 #   endif
 #else

-#   define SWIGEXPORT(a) a
+#   define SWIGEXPORT(a) a 

 #endif
 
 #endif
 

-#include "Python.h"
-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #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 *);
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);


@@ -531,7 +529,7 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject
     char * _arg1 = (char *) "Choose a directory";
     char * _arg2 = (char *) "";
     long  _arg3 = (long ) 0;
     char * _arg1 = (char *) "Choose a directory";
     char * _arg2 = (char *) "";
     long  _arg3 = (long ) 0;

-    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;


@@ -831,7 +829,7 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject
     char * _arg3 = (char *) "";
     char * _arg4 = (char *) "*.*";
     long  _arg5 = (long ) 0;
     char * _arg3 = (char *) "";
     char * _arg4 = (char *) "*.*";
     long  _arg5 = (long ) 0;

-    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj6 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj6 = 0;


@@ -1545,7 +1543,7 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args,
     int  _arg3;
     wxString * _arg4;
     long  _arg5 = (long ) wxOK|wxCANCEL|wxCENTRE;
     int  _arg3;
     wxString * _arg4;
     long  _arg5 = (long ) wxOK|wxCANCEL|wxCENTRE;

-    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;


@@ -1803,7 +1801,7 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args, PyO
     char * _arg2 = (char *) "Input Text";
     char * _arg3 = (char *) "";
     long  _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE;
     char * _arg2 = (char *) "Input Text";
     char * _arg3 = (char *) "";
     long  _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE;

-    wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj5 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj5 = 0;


@@ -2580,7 +2578,7 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args, PyObj
     char * _arg1;
     char * _arg2 = (char *) "Message box";
     long  _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE;
     char * _arg1;
     char * _arg2 = (char *) "Message box";
     long  _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE;

-    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;