Updates for tooltip support

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 1d3557cd10319c109df7c10c8c4ac4d3255d7c0a..753edfc5bed923c04515192e470ef7c51878cc34 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -61,11 +61,16 @@ public:
     virtual void SetValue(bool bVal);
     virtual bool GetValue(void) const ;
 
     virtual void SetValue(bool bVal);
     virtual bool GetValue(void) const ;
 

-    bool         OS2Command( WXUINT wParam
-                            ,WXWORD wId
-                           );
-    void         Command(wxCommandEvent& rEvent);
-    virtual void SetFocus(void);
+    bool            OS2Command( WXUINT wParam
+                               ,WXWORD wId
+                              );
+    void            Command(wxCommandEvent& rEvent);
+    virtual MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+    virtual void    SetFocus(void);
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h
index b4f8a2fc517b3f47c3ae0dd7a04c9a422875629a..c1324430edfe767cf0248a14cf9f208a9da694fe 100644 (file)
--- a/include/wx/os2/timer.h
+++ b/include/wx/os2/timer.h
@@ -29,6 +29,7 @@ public:
         { Init(); }
     ~wxTimer();
 
         { Init(); }
     ~wxTimer();
 

+    virtual void Notify(void);

     virtual bool Start( int  nMilliseconds = -1
                        ,bool bOneShot = FALSE
                       );
     virtual bool Start( int  nMilliseconds = -1
                        ,bool bOneShot = FALSE
                       );

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 8cad6a95c793f9f91f45f7b7862a910da335b6ff..c428072b28d746115c90e13fe8d8d802656653f0 100644 (file)
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -15,6 +15,9 @@
 #if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
 #if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 

+#define ID_TOOLTIMER                100
+#define ID_TOOLEXPTIMER             101
+

 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
 public:
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
 public:


@@ -22,7 +25,10 @@ public:
      * Public interface
      */
 
      * Public interface
      */
 

-    wxToolBar() { Init(); }
+    wxToolBar()
+    : m_vToolTimer(this, ID_TOOLTIMER)
+    , m_vToolExpTimer(this, ID_TOOLEXPTIMER)
+    { Init(); }

 
     inline wxToolBar( wxWindow*       pParent
                      ,wxWindowID      vId
 
     inline wxToolBar( wxWindow*       pParent
                      ,wxWindowID      vId


@@ -30,7 +36,8 @@ public:
                      ,const wxSize&   rSize = wxDefaultSize
                      ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
                      ,const wxString& rName = wxToolBarNameStr
                      ,const wxSize&   rSize = wxDefaultSize
                      ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
                      ,const wxString& rName = wxToolBarNameStr

-                    )
+                    ) : m_vToolTimer(this, ID_TOOLTIMER)
+                      , m_vToolExpTimer(this, ID_TOOLEXPTIMER)

     {
         Init();
         Create( pParent
     {
         Init();
         Create( pParent


@@ -187,9 +194,15 @@ private:
     void RaiseTool( wxToolBarToolBase* pTool
                    ,bool               bRaise = TRUE
                   );
     void RaiseTool( wxToolBarToolBase* pTool
                    ,bool               bRaise = TRUE
                   );

+    void OnTimer(wxTimerEvent& rEvent);

 
     static bool                     m_bInitialized;
 
 
     static bool                     m_bInitialized;
 

+    wxTimer                         m_vToolTimer;
+    wxTimer                         m_vToolExpTimer;
+    ULONG                           m_ulToolTimer;
+    ULONG                           m_ulToolExpTimer;
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };