X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8845289521c7f53e95b6dfd8275daab8b05639..97e4cf6da52b74dc58c59e780463c614054ec0a2:/include/wx/window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 566ba6c19d..dd75d380ee 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -513,9 +513,17 @@ public:
         // set this child as temporary default
     virtual void SetTmpDefaultItem(wxWindow * WXUNUSED(win)) { }
 
-        // Navigates in the specified direction by sending a wxNavigationKeyEvent
+        // navigates in the specified direction by sending a wxNavigationKeyEvent
     virtual bool Navigate(int flags = wxNavigationKeyEvent::IsForward);
 
+        // move this window just before/after the specified one in tab order
+        // (the other window must be our sibling!)
+    void MoveBeforeInTabOrder(wxWindow *win)
+        { DoMoveInTabOrder(win, MoveBefore); }
+    void MoveAfterInTabOrder(wxWindow *win)
+        { DoMoveInTabOrder(win, MoveAfter); }
+
+
     // parent/children relations
     // -------------------------
 
@@ -533,7 +541,7 @@ public:
         // is this window a top level one?
     virtual bool IsTopLevel() const;
 
-        // it doesn't really change parent, use ReParent() instead
+        // it doesn't really change parent, use Reparent() instead
     void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }
         // change the real parent of this window, return true if the parent
         // was changed, false otherwise (error or newParent == oldParent)
@@ -725,31 +733,31 @@ public:
 
         // set/retrieve the window colours (system defaults are used by
         // default): SetXXX() functions return true if colour was changed,
-        // SetDefaultXXX() reset the "m_hasXXX" flag after setting the value
-        // to prevent it from being inherited by our children
+        // SetDefaultXXX() reset the "m_inheritXXX" flag after setting the
+        // value to prevent it from being inherited by our children
     virtual bool SetBackgroundColour(const wxColour& colour);
-    void SetDefaultBackgroundColour(const wxColour& colour)
+    void SetOwnBackgroundColour(const wxColour& colour)
     {
         if ( SetBackgroundColour(colour) )
-            m_hasBgCol = false;
+            m_inheritBgCol = false;
     }
     wxColour GetBackgroundColour() const;
 
     virtual bool SetForegroundColour(const wxColour& colour);
-    void SetDefaultForegroundColour(const wxColour& colour)
+    void SetOwnForegroundColour(const wxColour& colour)
     {
         if ( SetForegroundColour(colour) )
-            m_hasFgCol = false;
+            m_inheritFgCol = false;
     }
     wxColour GetForegroundColour() const;
 
         // set/retrieve the font for the window (SetFont() returns true if the
         // font really changed)
     virtual bool SetFont(const wxFont& font) = 0;
-    void SetDefaultFont(const wxFont& font)
+    void SetOwnFont(const wxFont& font)
     {
         if ( SetFont(font) )
-            m_hasFont = false;
+            m_inheritFont = false;
     }
     wxFont GetFont() const;
 
@@ -898,6 +906,10 @@ public:
         // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const { return m_tooltip; }
     wxString GetToolTipText() const ;
+#else
+        // make it much easier to compile apps in an environment
+        // that doesn't support tooltips, such as PocketPC
+    inline void SetToolTip( const wxString & WXUNUSED(tip) ) {}
 #endif // wxUSE_TOOLTIPS
 
     // drag and drop
@@ -1031,6 +1043,13 @@ protected:
     virtual bool TryValidator(wxEvent& event);
     virtual bool TryParent(wxEvent& event);
 
+    // common part of MoveBefore/AfterInTabOrder()
+    enum MoveKind
+    {
+        MoveBefore,     // insert before the given window
+        MoveAfter       // insert after the given window
+    };
+    virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
 
 #if wxUSE_CONSTRAINTS
     // satisfy the constraints for the windows but don't set the window sizes
@@ -1120,6 +1139,11 @@ protected:
     bool                 m_hasBgCol:1;
     bool                 m_hasFgCol:1;
     bool                 m_hasFont:1;
+    
+    // and should it be inherited by children?
+    bool                 m_inheritBgCol:1;
+    bool                 m_inheritFgCol:1;
+    bool                 m_inheritFont:1;
 
     // window attributes
     long                 m_windowStyle,