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 4a32d658a10accc9e5709418b50e2fe233e6d2fd..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_
 
 #ifndef _WX_X11_TOPLEVEL_H_
 #define _WX_X11_TOPLEVEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11
 // ----------------------------------------------------------------------------


@@ -50,34 +46,26 @@ public:
     virtual ~wxTopLevelWindowX11();
 
     // implement base class pure virtuals
     virtual ~wxTopLevelWindowX11();
 
     // implement base class pure virtuals

-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);

     virtual bool IsMaximized() const;
     virtual bool IsMaximized() const;

-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);

     virtual bool IsIconized() const;
     virtual bool IsIconized() const;

-    virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }

     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     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;
 
     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
     // implementation

-    void SetNeedResizeInIdle( bool set = TRUE )
+    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; }
         { 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();
-
-    // set the icon for the window
-    void DoSetIcon( const wxIcon& icon );

 
     virtual bool SetShape(const wxRegion& region);
 
 
     virtual bool SetShape(const wxRegion& region);
 


@@ -85,9 +73,17 @@ protected:
     // client area smaller
     virtual wxPoint GetClientAreaOrigin() const;
 
     // client area smaller
     virtual wxPoint GetClientAreaOrigin() const;
 

+    virtual void OnInternalIdle();
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // set the icon for the window
+    void DoSetIcon( const wxIcon& icon );
+

     // For implementation of delayed resize events
     bool m_needResizeInIdle;
     // 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 DoGetClientSize( int *width, int *height ) const;
     virtual void DoGetSize( int *width, int *height ) const;


@@ -96,7 +92,7 @@ protected:
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoGetPosition( int *x, int *y ) const;
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoGetPosition( int *x, int *y ) const;

-    
+

     // Is the frame currently iconized?
     bool m_iconized;
 
     // Is the frame currently iconized?
     bool m_iconized;
 


@@ -110,7 +106,7 @@ protected:
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
     wxString              m_title;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
     wxString              m_title;

-    
+

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


@@ -119,4 +115,3 @@ protected:
 //extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 #endif // _WX_X11_TOPLEVEL_H_
 //extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 #endif // _WX_X11_TOPLEVEL_H_

-