OS/2 fix

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

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index 2cc960a242a5b94fb6f83ed248ae3e80a0013ea2..d4464c2ec9f8d930880599b6335f18a6bf69c995 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -11,7 +11,7 @@
 #ifndef __GTKTOPLEVELH__
 #define __GTKTOPLEVELH__
 
 #ifndef __GTKTOPLEVELH__
 #define __GTKTOPLEVELH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 


@@ -60,11 +60,23 @@ public:
     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; };
 

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

     virtual bool Show(bool show = TRUE);
 
     virtual bool Show(bool show = TRUE);
 

+    virtual void Raise();
+
+    virtual bool IsActive();
+

     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; }
 

+    // Experimental, to allow help windows to be
+    // viewable from within modal dialogs
+    virtual void AddGrab();
+    virtual void RemoveGrab();
+    virtual bool IsGrabbed() const { return m_grabbed; }
+

     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 


@@ -72,9 +84,6 @@ public:
     // from both DoSetSize() and DoSetClientSize()
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // from both DoSetSize() and DoSetClientSize()
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

-    // set the icon for this window
-    void DoSetIcon( const wxIcon& icon );
-

     // GTK callbacks
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
     // GTK callbacks
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();


@@ -111,6 +120,9 @@ protected:
 
     // is the frame currently iconized?
     bool m_isIconized;
 
     // is the frame currently iconized?
     bool m_isIconized;

+    // is the frame currently grabbed explicitly
+    // by the application?
+    bool m_grabbed;

 };
 
 #endif // __GTKTOPLEVELH__
 };
 
 #endif // __GTKTOPLEVELH__