Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised...

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

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index e95ee0f11c50ece2f0d55a0e55e9c6a1f4473593..ef3d2f8ef21ddd34d67b259f3db587af925ef688 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -7,20 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 //-----------------------------------------------------------------------------
 

-class wxTopLevelWindowGTK : public wxTopLevelWindowBase
+class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase

 {
 public:
     // construction
 {
 public:
     // construction


@@ -62,8 +56,14 @@ public:
 
     virtual bool SetShape(const wxRegion& region);
 
 
     virtual bool SetShape(const wxRegion& region);
 

+    virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
+

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


@@ -80,9 +80,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();


@@ -105,6 +102,10 @@ public:
     long          m_gdkFunc,
                   m_gdkDecor;
 
     long          m_gdkFunc,
                   m_gdkDecor;
 

+    // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
+    // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
+    int m_urgency_hint;
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();