Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index a84cf8a87e1a09ed0f3d9bc8bc5c65d347f9c71a..9f9374b06b6189b281fcc6f267ac85f57ffc4a26 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/toplevel.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx/gtk/toplevel.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -55,9 +54,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 SetShape(const wxRegion& region);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }

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


@@ -97,6 +94,8 @@ public:
 
     virtual void GTKHandleRealized();
 
 
     virtual void GTKHandleRealized();
 

+    void GTKConfigureEvent(int x, int y);
+

     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
 
     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
 


@@ -111,10 +110,11 @@ public:
                   m_gdkDecor;
 
     // size of WM decorations
                   m_gdkDecor;
 
     // size of WM decorations

-    wxSize m_decorSize;
-
-    // shape of the frame
-    wxRegion m_shape;
+    struct DecorSize
+    {
+        int left, right, top, bottom;
+    };
+    DecorSize m_decorSize;

 
     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
 
     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.


@@ -125,7 +125,7 @@ public:
     // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 
     // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 

-    void GTKUpdateDecorSize(const wxSize& decorSize);
+    void GTKUpdateDecorSize(const DecorSize& decorSize);

 
 protected:
     // give hints to the Window Manager for how the size
 
 protected:
     // give hints to the Window Manager for how the size


@@ -133,9 +133,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);
 


@@ -153,7 +150,11 @@ protected:
     bool m_deferShow;
 
 private:
     bool m_deferShow;
 
 private:

-    wxSize& GetCachedDecorSize();
+    void Init();
+    DecorSize& 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;