fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

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

+    DECLARE_EVENT_TABLE()

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


@@ -47,7 +48,6 @@ 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();
 


@@ -84,62 +84,60 @@ public:
     // --------------------------
 
     // GTK callbacks
     // --------------------------
 
     // GTK callbacks

-    virtual void GtkOnSize();

     virtual void OnInternalIdle();
 
     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);
 
     // 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_deferShow;

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

+    // return the size of the window without WM decorations
+    void GTKDoGetSize(int *width, int *height) const;
+
+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,
     // 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 = wxDefaultCoord, int maxH = wxDefaultCoord,
-                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
-
-protected:
+                                 int maxW, int maxH,
+                                 int incW, int incH);

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

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize()
+    // move the window to the specified location and resize it

     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // take into account WM decorations here
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // take into account WM decorations here

-    virtual void DoGetSize(int *width, int *height) const;

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     // override these methods to take into account tool/menu/statusbars
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     // override these methods to take into account tool/menu/statusbars

-    virtual void DoSetClientSize(int width, int height);

     virtual void DoGetClientSize(int *width, int *height) const;
 
     virtual void DoGetClientSize(int *width, int *height) const;
 

-    // this method takes the size of the window not taking account of
-    // decorations and is used by both DoSetSize() and DoSetClientSize()
-    void GTKDoSetSize(int width, int height);
-
-

     // string shown in the title bar
     wxString m_title;
 
     // string shown in the title bar
     wxString m_title;
 

+private:

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