X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..0c8392cac2d36d0d211432e71d3b24d3d93c22db:/wxPython/src/windows.i?ds=sidebyside

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 5b6ccf56da..ca44e8ddb5 100644
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -228,7 +228,6 @@ public:
     void FitInside();
 
     wxColour GetBackgroundColour();
-    wxBorder GetBorder() const;
 
     //wxList& GetChildren();
     %addmethods {
@@ -385,7 +384,10 @@ public:
     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);
@@ -431,7 +433,7 @@ public:
     %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
     "
@@ -459,6 +461,25 @@ public:
     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);
@@ -483,6 +504,18 @@ public:
 
     // 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:
-            return apply(self.CalcScrolledPosition1, args)
+            return self.CalcScrolledPosition1(*args)
         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:
-            return apply(self.CalcUnscrolledPosition1, args)
+            return self.CalcUnscrolledPosition1(*args)
         elif len(args) == 2:
-            return apply(self.CalcUnscrolledPosition2, args)
+            return self.CalcUnscrolledPosition2(*args)
         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*/);
+    wxMenuItem* FindItemByPosition(size_t position) const;
 
     wxString GetTitle();
     void SetTitle(const wxString& title);
@@ -730,8 +764,6 @@ public:
     %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
 
 
-
-
     %addmethods {
         void Destroy() { delete self; }
     }
@@ -809,6 +841,7 @@ public:
 
 
     wxMenu *GetMenu();
+    void SetMenu(wxMenu* menu);
     void SetId(int id);
     int  GetId();
     bool IsSeparator();