No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index a1a3c6d99a13062e426522014ae99aa2997b4a0c..dc75a430d823958a31543dca8d90879ca0b13aa0 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -1,21 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/toplevel.h
+// Name:        wx/gtk1/toplevel.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKTOPLEVELH__
 #define __GTKTOPLEVELH__
 
 #ifndef __GTKTOPLEVELH__
 #define __GTKTOPLEVELH__
 

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

 //-----------------------------------------------------------------------------
 // wxTopLevelWindowGTK
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxTopLevelWindowGTK
 //-----------------------------------------------------------------------------


@@ -49,22 +42,23 @@ public:
     virtual ~wxTopLevelWindowGTK();
 
     // implement base class pure virtuals
     virtual ~wxTopLevelWindowGTK();
 
     // 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);

     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }

 
     virtual bool SetShape(const wxRegion& region);
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
 
     virtual bool SetShape(const wxRegion& region);
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 

-    virtual bool Show(bool show = TRUE);
+    virtual void SetWindowStyleFlag( long style );
+
+    virtual bool Show(bool show = true);

 
     virtual void Raise();
 
 
     virtual void Raise();
 


@@ -93,7 +87,6 @@ public:
     // 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);
 

-    wxString      m_title;

     int           m_miniEdge,
                   m_miniTitle;
     GtkWidget    *m_mainWidget;
     int           m_miniEdge,
                   m_miniTitle;
     GtkWidget    *m_mainWidget;


@@ -124,6 +117,8 @@ protected:
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 

+    wxString      m_title;
+

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