added a call for invalidating the dc setup on mac explicitely (needed in case of...

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index f41accb0440281174b3630c9268bc6aa7445db92..502e8d2d66f4025494238f96afc360c246210693 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -31,6 +31,11 @@
 
 %pragma(python) code = "import wx"
 
+
+%{
+    static wxString wxPyEmptyStr("");
+%}
+
 //---------------------------------------------------------------------------
 
 class wxEvtHandler {
@@ -197,8 +202,8 @@ class wxWindow : public wxEvtHandler {
 public:
 
     wxWindow(wxWindow* parent, const wxWindowID id,
-             const wxPoint& pos = wxPyDefaultPosition,
-             const wxSize& size = wxPyDefaultSize,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
              long style = 0,
              char* name = "panel");
 
@@ -331,6 +336,10 @@ public:
         void SetPosition(const wxPoint& pos) {
             self->Move(pos);
         }
+
+        void SetRect(const wxRect& rect, int sizeFlags=wxSIZE_AUTO) {
+            self->SetSize(rect, sizeFlags);
+        }
     }
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
@@ -482,8 +491,8 @@ class wxPanel : public wxWindow {
 public:
     wxPanel(wxWindow* parent,
             const wxWindowID id,
-            const wxPoint& pos = wxPyDefaultPosition,
-            const wxSize& size = wxPyDefaultSize,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL,
             const char* name = "panel");
 
@@ -510,8 +519,8 @@ public:
     wxDialog(wxWindow* parent,
              const wxWindowID id,
              const wxString& title,
-             const wxPoint& pos = wxPyDefaultPosition,
-             const wxSize& size = wxPyDefaultSize,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              const char* name = "dialogBox");
 
@@ -538,8 +547,8 @@ class wxScrolledWindow : public wxPanel {
 public:
     wxScrolledWindow(wxWindow* parent,
                      const wxWindowID id = -1,
-                     const wxPoint& pos = wxPyDefaultPosition,
-                     const wxSize& size = wxPyDefaultSize,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
                      long style = wxHSCROLL | wxVSCROLL,
                      char* name = "scrolledWindow");
 
@@ -700,6 +709,10 @@ public:
     wxAcceleratorEntry *GetAccel();
     void SetAccel(wxAcceleratorEntry *accel);
 
+    static wxString GetLabelFromText(const wxString& text);
+
+    // TODO:  Add wxOwnerDrawn methods, also look at other ownerdrawn classes...
+
 };
 
 //---------------------------------------------------------------------------