Compile fix for the version of VC8 included in the 2003 PSDK.

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 3858f082719114bc75f48f3cb53fe475abed56b7..f27e872b6b535ee4cb5ddd3ec807f3d11d613b0b 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKTOPLEVELH__
-#define __GTKTOPLEVELH__
+#ifndef _WX_GTK_TOPLEVEL_H_
+#define _WX_GTK_TOPLEVEL_H_

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


@@ -51,6 +51,8 @@ public:
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 

+    virtual bool EnableCloseButton(bool enable = true);
+

     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 


@@ -58,6 +60,8 @@ public:
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 

+    virtual void SetWindowStyleFlag( long style );
+

     virtual bool Show(bool show = true);
 
     virtual void Raise();
     virtual bool Show(bool show = true);
 
     virtual void Raise();


@@ -67,6 +71,9 @@ public:
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 

+    virtual bool SetTransparent(wxByte alpha);
+    virtual bool CanSetTransparent();
+

     // Experimental, to allow help windows to be
     // viewable from within modal dialogs
     virtual void AddGrab();
     // Experimental, to allow help windows to be
     // viewable from within modal dialogs
     virtual void AddGrab();


@@ -76,12 +83,8 @@ public:
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize()
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-

     // GTK callbacks
     // GTK callbacks

-    virtual void GtkOnSize( int x, int y, int width, int height );
+    virtual void GtkOnSize();

     virtual void OnInternalIdle();
 
     // do *not* call this to iconize the frame, this is a private function!
     virtual void OnInternalIdle();
 
     // do *not* call this to iconize the frame, this is a private function!


@@ -109,11 +112,21 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // move the window to the specified location and resize it: this is called
+    // from both DoSetSize() and DoSetClientSize()
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+

     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

+    // give hints to the Window Manager for how the size
+    // of the TLW can be changed by dragging
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
+                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
+                                 

     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;
 


@@ -126,4 +139,4 @@ protected:
     bool m_grabbed;
 };
 
     bool m_grabbed;
 };
 

-#endif // __GTKTOPLEVELH__
+#endif // _WX_GTK_TOPLEVEL_H_