Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 2fa607c415b913186afb491b84bfefd69c99ed10..013e081df60b00a51e7b30e2a23324d340779440 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -16,7 +16,6 @@
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {

-    DECLARE_EVENT_TABLE()

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


@@ -53,6 +52,7 @@ public:
 
     virtual bool EnableCloseButton(bool enable = true);
 
 
     virtual bool EnableCloseButton(bool enable = true);
 

+    virtual void ShowWithoutActivating();

     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 


@@ -80,22 +80,21 @@ 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
     virtual void OnInternalIdle();
 
     // implementation from now on
     // --------------------------
 
     // GTK callbacks
     virtual void OnInternalIdle();
 

-    // Respond to system colour change
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-

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

-    bool m_deferShow;
-

     bool          m_fsIsShowing;         /* full screen */
     int           m_fsSaveGdkFunc, m_fsSaveGdkDecor;
     wxRect        m_fsSaveFrame;
     bool          m_fsIsShowing;         /* full screen */
     int           m_fsSaveGdkFunc, m_fsSaveGdkDecor;
     wxRect        m_fsSaveFrame;


@@ -107,6 +106,9 @@ public:
     // size of WM decorations
     wxSize m_decorSize;
 
     // size of WM decorations
     wxSize m_decorSize;
 

+    // shape of the frame
+    wxRegion m_shape;
+

     // 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;


@@ -139,12 +141,19 @@ protected:
     // string shown in the title bar
     wxString m_title;
 
     // string shown in the title bar
     wxString m_title;
 

+    bool m_deferShow;
+

 private:
 private:

+    wxSize& GetCachedDecorSize();
+

     // is the frame currently iconized?
     bool m_isIconized;
 
     // is the frame currently grabbed explicitly by the application?
     bool m_grabbed;
     // is the frame currently iconized?
     bool m_isIconized;
 
     // is the frame currently grabbed explicitly by the application?
     bool m_grabbed;

+
+    bool m_updateDecorSize;
+    bool m_deferShowAllowed;

 };
 
 #endif // _WX_GTK_TOPLEVEL_H_
 };
 
 #endif // _WX_GTK_TOPLEVEL_H_