CanAcceptFocus() now returns true if either the window itself or one of its children...

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

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 74f7411c4f9fa7bb0df54c90e8b9424cda6b69ad..ae820864c24de279e02b0b25b8eb9b34220f1d0d 100644 (file)
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -12,10 +12,6 @@
 #ifndef _WX_X11_TOPLEVEL_H_
 #define _WX_X11_TOPLEVEL_H_
 
-#ifdef __GNUG__
-    #pragma interface "toplevel.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11
 // ----------------------------------------------------------------------------
@@ -50,25 +46,35 @@ public:
     virtual ~wxTopLevelWindowX11();
 
     // implement base class pure virtuals
-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
     virtual void SetIcons(const wxIconBundle& icons);
     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 IsFullScreen() const { return m_fsIsShowing; }
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
-    
+
     // implementation
-    void SetNeedResizeInIdle( bool set = TRUE ) { m_needResizeInIdle = set; }
-    
+    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; }
+
+    virtual bool SetShape(const wxRegion& region);
+
+    // For implementation purposes - sometimes decorations make the
+    // client area smaller
+    virtual wxPoint GetClientAreaOrigin() const;
+
+    virtual void OnInternalIdle();
+
 protected:
     // common part of all ctors
     void Init();
@@ -76,21 +82,17 @@ protected:
     // 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;
-
     // For implementation of delayed resize events
     bool m_needResizeInIdle;
-    virtual void OnInternalIdle();
 
     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;
 
@@ -104,10 +106,12 @@ protected:
     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_
-