A few tweaks and cleanups

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

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 4f75c698caee662a3ead609cbd7ebdc52e52418b..0b16cf92022af4c50758b8b21b3ca3743d351507 100644 (file)
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -54,49 +54,67 @@ 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 SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
+    virtual void SetIcons(const wxIconBundle& icons);

     virtual void Restore();
 
     virtual void Restore();
 

-    virtual bool Show(bool show = TRUE);
+    virtual bool Show( bool show = TRUE );

 
 

-    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );

     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
     
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
     

-    // implementation from now on
-    // --------------------------
-
+    // implementation
+    void SetNeedResizeInIdle( bool set = TRUE )
+        { m_needResizeInIdle = set; }
+    void SetConfigureGeometry( int x, int y, int width, int height )
+        { m_x = x; m_y = y; m_width = width; m_height = height; }
+    

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

-    // create a new frame, return FALSE if it couldn't be created
-    bool CreateFrame(const wxString& title,
-                     const wxPoint& pos,
-                     const wxSize& size);
+    // set the icon for the window
+    void DoSetIcon( const wxIcon& icon );
+
+    // For implementation purposes - sometimes decorations make the
+    // client area smaller
+    virtual wxPoint GetClientAreaOrigin() const;

 
 

-    // create a new dialog using the given dialog template from resources,
-    // return FALSE if it couldn't be created
-    bool CreateDialog(const wxString& title,
-                      const wxPoint& pos,
-                      const wxSize& size);
+    // For implementation of delayed resize events
+    bool m_needResizeInIdle;
+    virtual void OnInternalIdle();

 
 

-    // is the frame currently iconized?
+    virtual void DoGetClientSize( int *width, int *height ) const;
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoSetClientSize(int width, int height);
+    virtual void DoSetSize(int x, int y,
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);
+    virtual void DoGetPosition( int *x, int *y ) const;
+    
+    // Is the frame currently iconized?

     bool m_iconized;
 
     bool m_iconized;
 

-    // should the frame be maximized when it will be shown? set by Maximize()
+    // Should the frame be maximized when it will be shown? set by Maximize()

     // when it is called while the frame is hidden
     bool m_maximizeOnShow;
 
     // Data to save/restore when calling ShowFullScreen
     // when it is called while the frame is hidden
     bool m_maximizeOnShow;
 
     // Data to save/restore when calling ShowFullScreen

-    long                  m_fsStyle; // Passed to ShowFullScreen
+    long                  m_fsStyle;   // Passed to ShowFullScreen

     wxRect                m_fsOldSize;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
     wxString              m_title;
     wxRect                m_fsOldSize;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
     wxString              m_title;

+    
+    // Geometry
+    int                   m_x,m_y,m_width,m_height;

 };
 
 };
 

+// list of all frames and modeless dialogs
+//extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+

 #endif // _WX_X11_TOPLEVEL_H_
 
 #endif // _WX_X11_TOPLEVEL_H_