don't try to refresh the menu bar before showing it, fixes crash on startup with...

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 8bd88ab478cc75fa438649ee1a8cb2b1c07fbffd..aaa636182dfc7b1f0ac360c9b095db0c500d03e6 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -206,6 +206,8 @@ public:
     void CentreOnScreen(int direction = wxBOTH );
     void CenterOnScreen(int direction = wxBOTH );
 
+    void Clear();
+
     // (uses apply'ed INOUT typemap, see above)
     %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
     wxPoint ClientToScreen(const wxPoint& pt);
@@ -213,6 +215,7 @@ public:
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();
+    bool IsBeingDeleted();
 #ifdef __WXMSW__
     void DragAcceptFiles(bool accept);
 #endif
@@ -380,6 +383,12 @@ public:
         return val
     "
 
+    void Freeze();
+    void Thaw();
+
+    wxString GetHelpText();
+    void SetHelpText(const wxString& helpText);
+
 
 //      // Properties list
 //      %pragma(python) addtoclass = "
@@ -517,6 +526,11 @@ public:
 
 //---------------------------------------------------------------------------
 
+
+// TODO: Add wrappers for the wxScrollHelper class, make wxScrolledWindow
+//       derive from it and wxPanel.
+
+
 class wxScrolledWindow : public wxPanel {
 public:
     wxScrolledWindow(wxWindow* parent,
@@ -543,7 +557,7 @@ public:
     void SetScrollPageSize(int orient, int pageSize);
     void SetTargetWindow(wxWindow* window);
     void GetViewStart(int* OUTPUT, int* OUTPUT);
-    void ViewStart(int* OUTPUT, int* OUTPUT);
+    %pragma(python) addtoclass = "ViewStart = GetViewStart"
 
     void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
     void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
@@ -640,6 +654,7 @@ public:
     void EnableTop(size_t pos, bool enable);
     void SetLabelTop(size_t pos, const wxString& label);
     wxString GetLabelTop(size_t pos);
+    int FindMenu(const wxString& title);
     int FindMenuItem(const wxString& menuString, const wxString& itemString);
     %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/);
     void Enable(int id, bool enable);
@@ -695,9 +710,9 @@ public:
     void SetFont(const wxFont& font);
     wxFont& GetFont();
     void SetTextColour(const wxColour& colText);
-    wxColour& GetTextColour();
+    wxColour GetTextColour();
     void SetBackgroundColour(const wxColour& colBack);
-    wxColour& GetBackgroundColour();
+    wxColour GetBackgroundColour();
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmpChecked);