wxToolTip part II

small change in tab traversal
  makefile corrections
  wxGLCanvas moved


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk1/listbox.h

@@ -94,6 +94,9 @@ public:
 #if wxUSE_DRAG_AND_DROP
   void SetDropTarget( wxDropTarget *dropTarget );
 #endif
+  void SetToolTip( wxToolTip *tip );
+  void SetToolTip( const wxString &tip );
+
 
 // implementation
     

include/wx/gtk1/tooltip.h

@@ -32,13 +32,24 @@ class wxToolTip: public wxObject
 {
 public:
   
-    wxToolTip() {}
+    wxToolTip( const wxString &tip );
+    ~wxToolTip();
     
-    static void Add( wxWindow *tool, const wxString &tip );
-    static void Enable( bool flag );
-    static void SetDelay( long msecs );
+    wxString GetTip();
+    
+    void Enable( bool flag );
+    void SetDelay( long msecs );
+    bool Ok();
 
+  // implementation
     
+    wxString     m_text;
+    
+    GtkTooltips *m_tooltips;
+    GdkColor    *m_bg;
+    GdkColor    *m_fg;
+    
+    void Create( GtkWidget *tool );
 };
 
 #endif // __GTKTOOLTIPH__

include/wx/gtk1/window.h

@@ -55,6 +55,7 @@ class wxItemResource;
 #if wxUSE_DRAG_AND_DROP
 class wxDropTarget;
 #endif
+class wxToolTip;
 
 //-----------------------------------------------------------------------------
 // callback definition for inserting a window (internal)
@@ -207,8 +208,8 @@ public:
   void PushEventHandler( wxEvtHandler *handler );
   wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
 
-  virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
+  virtual wxValidator *GetValidator();
 
   virtual void SetClientObject( wxClientData *data );
   virtual wxClientData *GetClientObject();
@@ -225,9 +226,13 @@ public:
   wxWindowID GetId() const;
 
   void SetCursor( const wxCursor &cursor );
-
+  
   void WarpPointer(int x, int y);
   
+  virtual void SetToolTip( const wxString &tip );
+  virtual void SetToolTip( wxToolTip *tip );
+  virtual wxToolTip& GetToolTip();
+
   virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
   virtual void Clear();
 
@@ -359,6 +364,7 @@ public:
   wxAcceleratorTable   m_acceleratorTable;
   wxClientData        *m_clientObject;
   void                *m_clientData;
+  wxToolTip           *m_toolTip;
 
   GtkWidget           *m_widget;
   GtkWidget           *m_wxwindow;