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 de507a0daea4cceae0b9bc82565752eef7d8b345..9f9374b06b6189b281fcc6f267ac85f57ffc4a26 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -2,13 +2,12 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKTOPLEVELH__
-#define __GTKTOPLEVELH__
+#ifndef _WX_GTK_TOPLEVEL_H_
+#define _WX_GTK_TOPLEVEL_H_

 
 //-----------------------------------------------------------------------------
 // wxTopLevelWindowGTK
 
 //-----------------------------------------------------------------------------
 // wxTopLevelWindowGTK


@@ -16,6 +15,7 @@
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {

+    typedef wxTopLevelWindowBase base_type;

 public:
     // construction
     wxTopLevelWindowGTK() { Init(); }
 public:
     // construction
     wxTopLevelWindowGTK() { Init(); }


@@ -47,14 +47,14 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;

-    virtual void SetIcon(const wxIcon& icon);

     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 

-    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+    virtual bool EnableCloseButton(bool enable = true);

 
 

-    virtual bool SetShape(const wxRegion& region);
+    virtual void ShowWithoutActivating();
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }

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


@@ -69,6 +69,10 @@ public:
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 

+    virtual void SetLabel(const wxString& label) { SetTitle( label ); }
+    virtual wxString GetLabel() const            { return GetTitle(); }
+
+

     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 


@@ -78,57 +82,88 @@ public:
     virtual void RemoveGrab();
     virtual bool IsGrabbed() const { return m_grabbed; }
 
     virtual void RemoveGrab();
     virtual bool IsGrabbed() const { return m_grabbed; }
 

+
+    virtual void Refresh( bool eraseBackground = true,
+                          const wxRect *rect = (const wxRect *) NULL );
+

     // implementation from now on
     // --------------------------
 
     // GTK callbacks
     // implementation from now on
     // --------------------------
 
     // GTK callbacks

-    virtual void GtkOnSize( int x, int y, int width, int height );

     virtual void OnInternalIdle();
 
     virtual void OnInternalIdle();
 

+    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);
 

-    int           m_miniEdge,
-                  m_miniTitle;

     GtkWidget    *m_mainWidget;
     GtkWidget    *m_mainWidget;

-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */

 
     bool          m_fsIsShowing;         /* full screen */
 
     bool          m_fsIsShowing;         /* full screen */

-    long          m_fsSaveGdkFunc, m_fsSaveGdkDecor;
-    long          m_fsSaveFlag;
+    int           m_fsSaveGdkFunc, m_fsSaveGdkDecor;

     wxRect        m_fsSaveFrame;
 
     // m_windowStyle translated to GDK's terms
     wxRect        m_fsSaveFrame;
 
     // m_windowStyle translated to GDK's terms

-    long          m_gdkFunc,
+    int           m_gdkFunc,

                   m_gdkDecor;
 
                   m_gdkDecor;
 

+    // size of WM decorations
+    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.
     int m_urgency_hint;
     // 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.
     int m_urgency_hint;

+    // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling
+    unsigned m_netFrameExtentsTimerId;

 
 

-protected:
-    // common part of all ctors
-    void Init();
+    // return the size of the window without WM decorations
+    void GTKDoGetSize(int *width, int *height) const;
+
+    void GTKUpdateDecorSize(const DecorSize& decorSize);

 
 

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize()
+protected:
+    // give hints to the Window Manager for how the size
+    // of the TLW can be changed by dragging
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW, int maxH,
+                                 int incW, int incH);
+    // move the window to the specified location and resize it

     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

-    // override wxWindow methods to take into account tool/menu/statusbars
+    // take into account WM decorations here

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     virtual void DoSetClientSize(int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     virtual void DoSetClientSize(int width, int height);

-    virtual void DoGetClientSize( int *width, int *height ) const;
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+    // string shown in the title bar
+    wxString m_title;

 
 

-    wxString      m_title;
+    bool m_deferShow;
+
+private:
+    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;

-    // is the frame currently grabbed explicitly
-    // by the application?
+
+    // is the frame currently grabbed explicitly by the application?

     bool m_grabbed;
     bool m_grabbed;

+
+    bool m_updateDecorSize;
+    bool m_deferShowAllowed;

 };
 
 };
 

-#endif // __GTKTOPLEVELH__
+#endif // _WX_GTK_TOPLEVEL_H_