compilation fix

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

diff --git a/include/wx/gtk1/tooltip.h b/include/wx/gtk1/tooltip.h
index 299f0945b22ddc60d2b389292726f769e109a208..9d92dd3f6f651defd24aa5904994d339788b2458 100644 (file)
--- a/include/wx/gtk1/tooltip.h
+++ b/include/wx/gtk1/tooltip.h
@@ -1,53 +1,58 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tooltip.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tooltip.h

-// Purpose:
+// Purpose:     wxToolTip class

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTOOLTIPH__
 #define __GTKTOOLTIPH__
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTOOLTIPH__
 #define __GTKTOOLTIPH__
 
 #ifdef __GNUG__

-#pragma interface
+    #pragma interface

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/string.h"

 #include "wx/object.h"
 #include "wx/object.h"

-#include "wx/window.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// classes
+// forward declarations

 //-----------------------------------------------------------------------------
 
 class wxToolTip;
 //-----------------------------------------------------------------------------
 
 class wxToolTip;

+class wxWindow;

 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 

-class wxToolTip: public wxObject
+class wxToolTip : public wxObject

 {
 public:
 {
 public:

-  
-    wxToolTip( const wxString &tip );
-    
-    void SetTip( const wxString &tip );
-    wxString GetTip() const;
-    wxWindow *GetWindow() const;
-    bool Ok() const;
-    
+    // globally change the tooltip parameters

     static void Enable( bool flag );
     static void SetDelay( long msecs );
 
     static void Enable( bool flag );
     static void SetDelay( long msecs );
 

-  // implementation
-    
+    wxToolTip( const wxString &tip );
+
+    // get/set the tooltip text
+    void SetTip( const wxString &tip );
+    wxString GetTip() const { return m_text; }
+
+    wxWindow *GetWindow() const { return m_window; }
+    bool IsOk() const { return m_window != NULL; }
+
+    // implementation
+    void Apply( wxWindow *win );
+
+private:

     wxString     m_text;
     wxWindow    *m_window;
     wxString     m_text;
     wxWindow    *m_window;

-    
-    void Apply( wxWindow *win );
+
+    DECLARE_ABSTRACT_CLASS(wxToolTip)

 };
 
 #endif // __GTKTOOLTIPH__
 };
 
 #endif // __GTKTOOLTIPH__