fixes to the new pointer array implementation

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

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 9d70ed319a7d3b94b2cddf76df4aa708c5e99924..1488491844ddc4341e415f6076e49dd1363a69b9 100644 (file)
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -62,40 +62,50 @@ public:
     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;
+    
     // implementation from now on
     // --------------------------
+    
+    void SetFocusWidget( wxWindow *focus )   { m_focusWidget = focus; }
+    wxWindow *GetFocusWidget() const         { return m_focusWidget; }
 
 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);
-
-    // 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);
-
-    // is the frame currently iconized?
+    // For implementation purposes - sometimes decorations make the client area
+    // smaller
+    virtual wxPoint GetClientAreaOrigin() const;
+
+    virtual void DoGetClientSize( 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;
 
-    // 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
-    long                  m_fsStyle; // Passed to ShowFullScreen
+    long                  m_fsStyle;   // Passed to ShowFullScreen
     wxRect                m_fsOldSize;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
+    wxString              m_title;
+    
+    // This widget gets the key input
+    wxWindow*             m_focusWidget;
 };
 
 // list of all frames and modeless dialogs
-;; extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+//extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 #endif // _WX_X11_TOPLEVEL_H_