fix text scrolling in GTK2 (patch 703988)

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 5b6ccf56da6dbab039eb4bb74b1779804eb9f5c9..41c469a0386dae767fbe05322d10915caab6c2ea 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -202,7 +202,7 @@ public:
     void CentreOnScreen(int direction = wxBOTH );
     void CenterOnScreen(int direction = wxBOTH );
 
     void CentreOnScreen(int direction = wxBOTH );
     void CenterOnScreen(int direction = wxBOTH );
 

-    void Clear();
+    void ClearBackground();

 
     // (uses apply'ed INOUT typemap, see above)
     %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
 
     // (uses apply'ed INOUT typemap, see above)
     %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);


@@ -228,7 +228,6 @@ public:
     void FitInside();
 
     wxColour GetBackgroundColour();
     void FitInside();
 
     wxColour GetBackgroundColour();

-    wxBorder GetBorder() const;

 
     //wxList& GetChildren();
     %addmethods {
 
     //wxList& GetChildren();
     %addmethods {


@@ -385,7 +384,10 @@ public:
     bool Show(bool show=TRUE);
     bool TransferDataFromWindow();
     bool TransferDataToWindow();
     bool Show(bool show=TRUE);
     bool TransferDataFromWindow();
     bool TransferDataToWindow();

-    void UpdateWindowUI();
+
+    // send wxUpdateUIEvents to this window, and children if recurse is TRUE
+    void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
+

     bool Validate();
 
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     bool Validate();
 
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);


@@ -431,7 +433,7 @@ public:
     %pragma(python) addtoclass = "# replaces broken shadow method
     def GetCaret(self, *_args, **_kwargs):
         from misc2 import wxCaretPtr
     %pragma(python) addtoclass = "# replaces broken shadow method
     def GetCaret(self, *_args, **_kwargs):
         from misc2 import wxCaretPtr

-        val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
+        val = windowsc.wxWindow_GetCaret(self, *_args, **_kwargs)

         if val: val = wxCaretPtr(val)
         return val
     "
         if val: val = wxCaretPtr(val)
         return val
     "


@@ -459,6 +461,25 @@ public:
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
     wxAcceleratorTable *GetAcceleratorTable();
 
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
     wxAcceleratorTable *GetAcceleratorTable();
 

+    %addmethods {
+        // hot keys (system wide accelerators)
+        bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) {
+#if wxUSE_HOTKEY
+            return self->RegisterHotKey(hotkeyId, modifiers, keycode);
+#else
+            return FALSE;
+#endif
+        }
+
+        bool UnregisterHotKey(int hotkeyId) {
+#if wxUSE_HOTKEY
+            return self->UnregisterHotKey(hotkeyId);
+#else
+            return FALSE;
+#endif
+        }
+    }
+

 #ifdef __WXMSW__
     // A way to do the native draw first...  Too bad it isn't in wxGTK too.
     void OnPaint(wxPaintEvent& event);
 #ifdef __WXMSW__
     // A way to do the native draw first...  Too bad it isn't in wxGTK too.
     void OnPaint(wxPaintEvent& event);


@@ -483,6 +504,18 @@ public:
 
     // does this window have the capture?
     bool HasCapture() const;
 
     // does this window have the capture?
     bool HasCapture() const;

+
+    void SetThemeEnabled(bool enable);
+    bool GetThemeEnabled();
+
+    // get the window border style from the given flags: this is different from
+    // simply doing flags & wxBORDER_MASK because it uses GetDefaultBorder() to
+    // translate wxBORDER_DEFAULT to something reasonable
+    %name(GetBorderFlags) wxBorder GetBorder(long flags) const;
+
+    // get border for the flags of this window
+    wxBorder GetBorder() const;
+

 };
 
 
 };
 
 


@@ -613,17 +646,17 @@ public:
     %pragma(python) addtoclass = "
     def CalcScrolledPosition(self, *args):
         if len(args) == 1:
     %pragma(python) addtoclass = "
     def CalcScrolledPosition(self, *args):
         if len(args) == 1:

-            return apply(self.CalcScrolledPosition1, args)
+            return self.CalcScrolledPosition1(*args)

         elif len(args) == 2:
         elif len(args) == 2:

-            return apply(self.CalcScrolledPosition2, args)
+            return self.CalcScrolledPosition2(*args)

         else:
             raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
 
     def CalcUnscrolledPosition(self, *args):
         if len(args) == 1:
         else:
             raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
 
     def CalcUnscrolledPosition(self, *args):
         if len(args) == 1:

-            return apply(self.CalcUnscrolledPosition1, args)
+            return self.CalcUnscrolledPosition1(*args)

         elif len(args) == 2:
         elif len(args) == 2:

-            return apply(self.CalcUnscrolledPosition2, args)
+            return self.CalcUnscrolledPosition2(*args)

         else:
             raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
 "
         else:
             raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
 "


@@ -713,6 +746,7 @@ public:
 
     int FindItem(const wxString& itemString);
     %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/);
 
     int FindItem(const wxString& itemString);
     %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/);

+    wxMenuItem* FindItemByPosition(size_t position) const;

 
     wxString GetTitle();
     void SetTitle(const wxString& title);
 
     wxString GetTitle();
     void SetTitle(const wxString& title);


@@ -730,8 +764,6 @@ public:
     %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
 
 
     %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
 
 

-
-

     %addmethods {
         void Destroy() { delete self; }
     }
     %addmethods {
         void Destroy() { delete self; }
     }


@@ -809,6 +841,7 @@ public:
 
 
     wxMenu *GetMenu();
 
 
     wxMenu *GetMenu();

+    void SetMenu(wxMenu* menu);

     void SetId(int id);
     int  GetId();
     bool IsSeparator();
     void SetId(int id);
     int  GetId();
     bool IsSeparator();