wxMGL compilation fix

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 40a07a1517428dcdc22fe8b6919965f0f4481df4..94a77bef2ea40e383c98a2ce40c81305dec15ce0 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -16,6 +16,7 @@
 %{
 #include "helpers.h"
 #include <wx/menuitem.h>
+#include <wx/tooltip.h>
 %}
 
 //----------------------------------------------------------------------
@@ -31,9 +32,14 @@
 
 %pragma(python) code = "import wx"
 
+
+%{
+    static wxString wxPyEmptyStr("");
+%}
+
 //---------------------------------------------------------------------------
 
-class wxEvtHandler {
+class wxEvtHandler : public wxObject {
 public:
     wxEvtHandler();
 
@@ -65,13 +71,11 @@ public:
                                    (wxObjectEventFunction)
                                     &wxPyCallback::EventThunker);
         }
-
     }
 
-    %pragma(python) addtoclass = "
-    _prop_list_ = {}
-    "
-
+//      %pragma(python) addtoclass = "
+//      _prop_list_ = {}
+//      "
 //      %pragma(python) addtoclass = "
 //      def __getattr__(self, name):
 //          pl = self._prop_list_
@@ -107,6 +111,9 @@ public:
     wxWindow* GetWindow();
     void SetWindow(wxWindow* window);
 
+    static bool IsSilent();
+    static void SetBellOnError(int doIt = TRUE);
+
 //      // Properties list
 //      %pragma(python) addtoclass = "
 //      _prop_list_ = {
@@ -116,15 +123,6 @@ public:
 //      "
 };
 
-%inline %{
-    bool wxValidator_IsSilent() {
-        return wxValidator::IsSilent();
-    }
-
-    void wxValidator_SetBellOnError(int doIt = TRUE) {
-        wxValidator::SetBellOnError(doIt);
-    }
-%}
 
 //----------------------------------------------------------------------
 %{
@@ -133,7 +131,6 @@ class wxPyValidator : public wxValidator {
 public:
     wxPyValidator() {
     }
-//    wxPyValidator(const wxPyValidator& other);
 
     ~wxPyValidator() {
     }
@@ -161,12 +158,12 @@ public:
         return ptr;
     }
 
+
     DEC_PYCALLBACK_BOOL_WXWIN(Validate);
     DEC_PYCALLBACK_BOOL_(TransferToWindow);
     DEC_PYCALLBACK_BOOL_(TransferFromWindow);
 
     PYPRIVATE;
-//    PyObject*   m_data;
 };
 
 IMP_PYCALLBACK_BOOL_WXWIN(wxPyValidator, wxValidator, Validate);
@@ -180,12 +177,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator);
 class wxPyValidator : public wxValidator {
 public:
     wxPyValidator();
-//    ~wxPyValidator();
-
-    %addmethods { void Destroy() { delete self; } }
 
     void _setSelf(PyObject* self, PyObject* _class, int incref=TRUE);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 0)"
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 1)"
 
 };
 
@@ -197,8 +191,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");
 
@@ -212,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);
@@ -219,6 +215,7 @@ public:
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();
+    bool IsBeingDeleted();
 #ifdef __WXMSW__
     void DragAcceptFiles(bool accept);
 #endif
@@ -343,6 +340,7 @@ public:
     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     void SetEventHandler(wxEvtHandler* handler);
+    void SetExtraStyle(long exStyle);
     void SetTitle(const wxString& title);
     bool Show(bool show);
     bool TransferDataFromWindow();
@@ -377,26 +375,17 @@ public:
 
     void SetCaret(wxCaret *caret);
     wxCaret *GetCaret();
-    %pragma(python) addtoclass = "# replaces broken shadow methods
+    %pragma(python) addtoclass = "# replaces broken shadow method
     def GetCaret(self, *_args, **_kwargs):
         from misc2 import wxCaretPtr
         val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
         if val: val = wxCaretPtr(val)
         return val
-
-    def GetSizer(self, *_args, **_kwargs):
-        from sizers import wxSizerPtr
-        val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs)
-        if val: val = wxSizerPtr(val)
-        return val
-
-    def GetToolTip(self, *_args, **_kwargs):
-        from misc2 import wxToolTipPtr
-        val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs)
-        if val: val = wxToolTipPtr(val)
-        return val
     "
 
+    void Freeze();
+    void Thaw();
+
 
 //      // Properties list
 //      %pragma(python) addtoclass = "
@@ -486,8 +475,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");
 
@@ -497,14 +486,6 @@ public:
     wxButton* GetDefaultItem();
     void SetDefaultItem(wxButton *btn);
 
-    // fix some SWIG trouble...
-    %pragma(python) addtoclass = "
-    def GetDefaultItem(self):
-        import controls
-        val = windowsc.wxPanel_GetDefaultItem(self.this)
-        val = controls.wxButtonPtr(val)
-        return val
-"
 };
 
 //---------------------------------------------------------------------------
@@ -514,8 +495,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");
 
@@ -534,16 +515,25 @@ public:
 
     int  GetReturnCode();
     void SetReturnCode(int retCode);
+
+    wxSizer* CreateTextSizer( const wxString &message );
+    wxSizer* CreateButtonSizer( long flags );
+
 };
 
 //---------------------------------------------------------------------------
 
+
+// TODO: Add wrappers for the wxScrollHelper class, make wxScrolledWindow
+//       derive from it and wxPanel.
+
+
 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");
 
@@ -564,11 +554,16 @@ 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);
 
+    void SetScale(double xs, double ys);
+    double GetScaleX();
+    double GetScaleY();
+
+    void AdjustScrollbars();
 };
 
 //----------------------------------------------------------------------
@@ -656,6 +651,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);
@@ -674,7 +670,7 @@ public:
 
 //----------------------------------------------------------------------
 
-class wxMenuItem {
+class wxMenuItem : public wxObject {
 public:
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
                const wxString& text = wxPyEmptyStr,
@@ -704,6 +700,30 @@ public:
     wxAcceleratorEntry *GetAccel();
     void SetAccel(wxAcceleratorEntry *accel);
 
+    static wxString GetLabelFromText(const wxString& text);
+
+    // wxOwnerDrawn methods
+#ifdef __WXMSW__
+    void SetFont(const wxFont& font);
+    wxFont& GetFont();
+    void SetTextColour(const wxColour& colText);
+    wxColour GetTextColour();
+    void SetBackgroundColour(const wxColour& colBack);
+    wxColour GetBackgroundColour();
+    void SetBitmaps(const wxBitmap& bmpChecked,
+                    const wxBitmap& bmpUnchecked = wxNullBitmap);
+    void SetBitmap(const wxBitmap& bmpChecked);
+    const wxBitmap& GetBitmap(bool bChecked = TRUE);
+    void SetMarginWidth(int nWidth);
+    int GetMarginWidth();
+    static int GetDefaultMarginWidth();
+    //void SetName(const wxString& strName);
+    //const wxString& GetName();
+    //void SetCheckable(bool checkable);
+    //bool IsCheckable();
+    bool IsOwnerDrawn();
+    void ResetOwnerDrawn();
+#endif
 };
 
 //---------------------------------------------------------------------------