made wxStringInputStream::GetSize() public instead of protected

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

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index 1f4a35c268d6317557e6b7ba0f25cd27b2c1f38a..8ee1660d8bfc94ba268ad26f18a813a64eef1c5f 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -11,7 +11,7 @@
 #ifndef __GTKTOPLEVELH__
 #define __GTKTOPLEVELH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "toplevel.h"
 #endif
 
@@ -60,11 +60,19 @@ public:
     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 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
     // --------------------------
 
@@ -72,9 +80,6 @@ public:
     // 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();
@@ -101,9 +106,6 @@ protected:
     // common part of all ctors
     void Init();
 
-    // focus event handler
-    void OnSetFocus(wxFocusEvent& event);
-
     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoSetSize(int x, int y,
                            int width, int height,
@@ -114,8 +116,9 @@ protected:
 
     // is the frame currently iconized?
     bool m_isIconized;
-
-    DECLARE_EVENT_TABLE()
+    // is the frame currently grabbed explicitly
+    // by the application?
+    bool m_grabbed;
 };
 
 #endif // __GTKTOPLEVELH__