spinbutton code simplification

[wxWidgets.git] / include / wx / toplevel.h

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index dbfa07ef6bfb566ca116d1a59aeb735d919b4607..69c5a76ac1a7379faaf822732aa33171ec299d44 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -137,6 +137,10 @@ public:
     // return true if the frame is maximized
     virtual bool IsMaximized() const = 0;
 
     // return true if the frame is maximized
     virtual bool IsMaximized() const = 0;
 

+    // return true if the frame is always maximized
+    // due to native guidelines or current policy
+    virtual bool IsAlwaysMaximized() const;
+

     // return true if the frame is iconized
     virtual bool IsIconized() const = 0;
 
     // return true if the frame is iconized
     virtual bool IsIconized() const = 0;
 


@@ -173,8 +177,15 @@ public:
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     // Is this the active frame (highlighted in the taskbar)?
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     // Is this the active frame (highlighted in the taskbar)?

-    virtual bool IsActive()
-        { return (wxGetTopLevelParent(FindFocus()) == this); }
+    virtual bool IsActive() { return wxGetTopLevelParent(FindFocus()) == this; }
+
+    // this function may be overridden to return false to allow closing the
+    // application even when this top level window is still open
+    //
+    // notice that the window is still closed prior to the application exit and
+    // so it can still veto it even if it returns false from here
+    virtual bool ShouldPreventAppExit() const { return true; }
+

 
 #if defined(__SMARTPHONE__)
     virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
 
 #if defined(__SMARTPHONE__)
     virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;


@@ -229,13 +240,6 @@ protected:
     virtual bool IsOneOfBars(const wxWindow *WXUNUSED(win)) const
         { return false; }
 
     virtual bool IsOneOfBars(const wxWindow *WXUNUSED(win)) const
         { return false; }
 

-    // this function may be overridden to return false to allow closing the
-    // application even when this top level window is still open
-    //
-    // notice that the window is still closed prior to the application exit and
-    // so it can still veto it even if it returns false from here
-    virtual bool ShouldPreventAppExit() const { return true; }
-

     // check if we should exit the program after deleting this window
     bool IsLastBeforeExit() const;
 
     // check if we should exit the program after deleting this window
     bool IsLastBeforeExit() const;