wxMGL compilation fix

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index ddbf6b644a812b5d596a5275d32b5eb6ce4be7b8..94a77bef2ea40e383c98a2ce40c81305dec15ce0 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 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);
     // (uses apply'ed INOUT typemap, see above)
     %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
     wxPoint ClientToScreen(const wxPoint& pt);


@@ -381,6 +383,9 @@ public:
         return val
     "
 
         return val
     "
 

+    void Freeze();
+    void Thaw();
+

 
 //      // Properties list
 //      %pragma(python) addtoclass = "
 
 //      // Properties list
 //      %pragma(python) addtoclass = "


@@ -518,6 +523,11 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+
+// TODO: Add wrappers for the wxScrollHelper class, make wxScrolledWindow
+//       derive from it and wxPanel.
+
+

 class wxScrolledWindow : public wxPanel {
 public:
     wxScrolledWindow(wxWindow* parent,
 class wxScrolledWindow : public wxPanel {
 public:
     wxScrolledWindow(wxWindow* parent,


@@ -544,7 +554,7 @@ public:
     void SetScrollPageSize(int orient, int pageSize);
     void SetTargetWindow(wxWindow* window);
     void GetViewStart(int* OUTPUT, int* OUTPUT);
     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);
 
     void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
     void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);


@@ -641,6 +651,7 @@ public:
     void EnableTop(size_t pos, bool enable);
     void SetLabelTop(size_t pos, const wxString& label);
     wxString GetLabelTop(size_t pos);
     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);
     int FindMenuItem(const wxString& menuString, const wxString& itemString);
     %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/);
     void Enable(int id, bool enable);


@@ -696,9 +707,9 @@ public:
     void SetFont(const wxFont& font);
     wxFont& GetFont();
     void SetTextColour(const wxColour& colText);
     void SetFont(const wxFont& font);
     wxFont& GetFont();
     void SetTextColour(const wxColour& colText);

-    wxColour& GetTextColour();
+    wxColour GetTextColour();

     void SetBackgroundColour(const wxColour& colBack);
     void SetBackgroundColour(const wxColour& colBack);

-    wxColour& GetBackgroundColour();
+    wxColour GetBackgroundColour();

     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmpChecked);
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmpChecked);