Reverted wxString members to const wxChar * for struct BugsGridData

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

diff --git a/utils/wxPython/src/misc2.i b/utils/wxPython/src/misc2.i
index 8ca4431d38f6260fd6cb1232492d80a6dc62334f..cc61878322a63fe265885b30135005de46b98438 100644 (file)
--- a/utils/wxPython/src/misc2.i
+++ b/utils/wxPython/src/misc2.i
@@ -56,21 +56,21 @@ wxString wxGetTextFromUser(const wxString& message,
 
 // TODO: Need to custom wrap this one...
 // int wxGetMultipleChoice(char* message, char* caption,
-//                         int LCOUNT, char** LIST,
+//                         int LCOUNT, char** choices,
 //                         int nsel, int *selection,
 //                         wxWindow *parent = NULL, int x = -1, int y = -1,
 //                         bool centre = TRUE, int width=150, int height=200);
 
 
 wxString wxGetSingleChoice(const wxString& message, const wxString& caption,
-                           int LCOUNT, wxString* LIST,
+                           int LCOUNT, wxString* choices,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,
                            bool centre = TRUE,
                            int width=150, int height=200);
 
 int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
-                           int LCOUNT, wxString* LIST,
+                           int LCOUNT, wxString* choices,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,
                            bool centre = TRUE,
@@ -274,10 +274,10 @@ public:
     wxWindow *GetWindow();
     %name(MoveXY)void Move(int x, int y);
     void Move(const wxPoint& pt);
+    %name(SetSizeWH) void SetSize(int width, int height);
+    void SetSize(const wxSize& size);
     void Show(int show = TRUE);
     void Hide();
-    void OnSetFocus();
-    void OnKillFocus();
 };
 
 %inline %{
@@ -320,6 +320,26 @@ public:
         wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
         bool fixedWidthOnly = FALSE);
     bool EnumerateEncodings(const char* facename = "");
+
+    //wxArrayString* GetEncodings();
+    //wxArrayString* GetFacenames();
+    %addmethods {
+        PyObject* GetEncodings() {
+            wxArrayString* arr = self->GetEncodings();
+            PyObject* list = PyList_New(0);
+            for (size_t x=0; x<arr->GetCount(); x++)
+                PyList_Append(list, PyString_FromString((*arr)[x]));
+            return list;
+        }
+
+        PyObject* GetFacenames() {
+            wxArrayString* arr = self->GetFacenames();
+            PyObject* list = PyList_New(0);
+            for (size_t x=0; x<arr->GetCount(); x++)
+                PyList_Append(list, PyString_FromString((*arr)[x]));
+            return list;
+        }
+    }
 };
 
 //----------------------------------------------------------------------
@@ -333,6 +353,7 @@ public:
 //----------------------------------------------------------------------
 
 void wxPostEvent(wxEvtHandler *dest, wxEvent& event);
+void wxWakeUpIdle();
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------