Added Navigate, SetMinSize, SetMaxSize wxWindow methods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i
index d8443aef031999d955fcc4dd85ee26dd94241e1e..0ebaae3facc248d4e914ef7c983a0d8d923bb361 100644 (file)
--- a/wxPython/src/_event.i
+++ b/wxPython/src/_event.i
@@ -1104,17 +1104,24 @@ public:
     
     // direction: forward (True) or backward (False)
     bool GetDirection() const;
     
     // direction: forward (True) or backward (False)
     bool GetDirection() const;

-    void SetDirection(bool bForward);
+    void SetDirection(bool forward);

 
     // it may be a window change event (MDI, notebook pages...) or a control
     // change event
     bool IsWindowChange() const;
 
     // it may be a window change event (MDI, notebook pages...) or a control
     // change event
     bool IsWindowChange() const;

-    void SetWindowChange(bool bIs);
+    void SetWindowChange(bool ischange);

 
 

+    void SetFlags(long flags);
+    

     // the child which has the focus currently (may be NULL - use
     // wxWindow::FindFocus then)
     wxWindow* GetCurrentFocus() const;
     void SetCurrentFocus(wxWindow *win);
     // the child which has the focus currently (may be NULL - use
     // wxWindow::FindFocus then)
     wxWindow* GetCurrentFocus() const;
     void SetCurrentFocus(wxWindow *win);

+
+    enum {
+        IsForward,
+        WinChange
+    };

 };
 
 
 };
 
 

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 687bc7088da253814b9a403e3dea648892024a6d..d907a437595e564444c32b10c8eede65740a171c 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -567,14 +567,20 @@ anything if there are no subwindows.", "");
         "Allows specification of minimum and maximum window sizes, and window
 size increments. If a pair of values is not set (or set to -1), the
 default values will be used.  If this function is called, the user
         "Allows specification of minimum and maximum window sizes, and window
 size increments. If a pair of values is not set (or set to -1), the
 default values will be used.  If this function is called, the user

-will not be able to size the window outside the given bounds. The
-resizing increments are only significant under Motif or Xt.", "");
-    virtual void SetSizeHints( int minW, int minH,
-                               int maxW = -1, int maxH = -1,
-                               int incW = -1, int incH = -1 );
+will not be able to size the window outside the given bounds (if it is
+a top-level window.)  Sizers will also inspect the minimum window size
+and will use that value if set when calculating layout.
+
+The resizing increments are only significant under Motif or Xt.", "
+
+:see: `GetMinSize`, `GetMaxSize`, `SetMinSize`, `SetMaxSize`
+");

     void SetSizeHints( const wxSize& minSize,
                        const wxSize& maxSize=wxDefaultSize,
                        const wxSize& incSize=wxDefaultSize);
     void SetSizeHints( const wxSize& minSize,
                        const wxSize& maxSize=wxDefaultSize,
                        const wxSize& incSize=wxDefaultSize);

+    virtual void SetSizeHints( int minW, int minH,
+                               int maxW = -1, int maxH = -1,
+                               int incW = -1, int incH = -1 );

 
     
     %nokwargs SetVirtualSizeHints;
 
     
     %nokwargs SetVirtualSizeHints;


@@ -583,38 +589,49 @@ resizing increments are only significant under Motif or Xt.", "");
 pair of values is not set (or set to -1), the default values will be
 used.  If this function is called, the user will not be able to size
 the virtual area of the window outside the given bounds.", "");
 pair of values is not set (or set to -1), the default values will be
 used.  If this function is called, the user will not be able to size
 the virtual area of the window outside the given bounds.", "");

-    virtual void SetVirtualSizeHints( int minW, int minH,
-                                      int maxW = -1, int maxH = -1 );

     void SetVirtualSizeHints( const wxSize& minSize,
                               const wxSize& maxSize=wxDefaultSize);
     void SetVirtualSizeHints( const wxSize& minSize,
                               const wxSize& maxSize=wxDefaultSize);

+    virtual void SetVirtualSizeHints( int minW, int minH,
+                                      int maxW = -1, int maxH = -1 );

     
     DocDeclStr(
     
     DocDeclStr(

-        virtual int , GetMinWidth() const,
+        virtual wxSize , GetMaxSize() const,

         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        virtual int , GetMinHeight() const,
+        virtual wxSize , GetMinSize() const,

         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        int , GetMaxWidth() const,
+        void , SetMinSize(const wxSize& minSize),
+        "A more convenient method than `SetSizeHints` for setting just the
+min size.", "");
+    
+    DocDeclStr(
+        void , SetMaxSize(const wxSize& maxSize),
+        "A more convenient method than `SetSizeHints` for setting just the
+max size.", "");
+    
+
+
+    DocDeclStr(
+        virtual int , GetMinWidth() const,

         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        int , GetMaxHeight() const,
+        virtual int , GetMinHeight() const,

         "", "");
     
         "", "");
     

-

     DocDeclStr(
     DocDeclStr(

-        virtual wxSize , GetMaxSize() const,
+        int , GetMaxWidth() const,

         "", "");
     
         "", "");
     

-

     DocDeclStr(
     DocDeclStr(

-        virtual wxSize , GetMinSize() const,
+        int , GetMaxHeight() const,

         "", "");
     
     
         "", "");
     
     

+    

     DocStr(SetVirtualSize,
            "Set the the virtual size of a window in pixels.  For most windows this
 is just the client area of the window, but for some like scrolled
     DocStr(SetVirtualSize,
            "Set the the virtual size of a window in pixels.  For most windows this
 is just the client area of the window, but for some like scrolled


@@ -812,9 +829,33 @@ by pressing <Enter> such as the OK button on a wx.Dialog.", "");
         "Set this child as temporary default", "");
     
 
         "Set this child as temporary default", "");
     
 

+    // Navigates in the specified direction by sending a wxNavigationKeyEvent
+    DocDeclAStr(
+        virtual bool , Navigate(int flags = wxNavigationKeyEvent::IsForward),
+        "Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool",
+        "Does keyboard navigation from this window to another, by sending a
+`wx.NavigationKeyEvent`.", "
+ 
+    :param flags: A combination of the ``IsForward`` and ``WinChange``
+                  values in the `wx.NavigationKeyEvent` class, which
+                  determine if the navigation should be in forward or
+                  reverse order, and if it should be able to cross
+                  parent window boundaries, such as between notebook
+                  pages or MDI child frames.  Typically the status of
+                  the Shift key (for forward or reverse) or the
+                  Control key (for WinChange) would be used to
+                  determine how to set the flags.
+
+One situation in which you may wish to call this method is from a text
+control custom keypress handler to do the default navigation behaviour
+for the tab key, since the standard default behaviour for a multiline
+text control with the wx.TE_PROCESS_TAB style is to insert a tab and
+not navigate to the next control.");

     
 
 
     
 
 

+
+

     // parent/children relations
     // -------------------------
 
     // parent/children relations
     // -------------------------