activating DrawRectangle optimization

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index d7b19d6409bd1d0e4fd590cd31052192e3c814f1..768f2e14f5b9662971ce27e8727cafd6fc30924d 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -55,7 +55,7 @@ public:
 
     virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }

 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 


@@ -128,9 +128,6 @@ protected:
     virtual void DoSetSizeHints( int minW, int minH,
                                  int maxW, int maxH,
                                  int incW, int incH);
     virtual void DoSetSizeHints( int minW, int minH,
                                  int maxW, int maxH,
                                  int incW, int incH);

-    // common part of all ctors
-    void Init();
-

     // move the window to the specified location and resize it
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // move the window to the specified location and resize it
     virtual void DoMoveWindow(int x, int y, int width, int height);
 


@@ -148,8 +145,12 @@ protected:
     bool m_deferShow;
 
 private:
     bool m_deferShow;
 
 private:

+    void Init();

     wxSize& GetCachedDecorSize();
 
     wxSize& GetCachedDecorSize();
 

+    // size hint increments
+    int m_incWidth, m_incHeight;
+

     // is the frame currently iconized?
     bool m_isIconized;
 
     // is the frame currently iconized?
     bool m_isIconized;