Added dummy OnIdle to wxWindow in wxGTK; doc tweaks

[wxWidgets.git] / src / msw / taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 9c2d0342604232903f6d268cc5b49074a77ffb2a..b34e42e02e83f0dd0960c86ce81f329e48826cf0 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -23,18 +23,27 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"

+#include "wx/window.h"
+#include "wx/frame.h"
+#include "wx/utils.h"

 #endif
 
 #endif
 

-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__TWIN32__)

 
 

-#include <wx/msw/taskbar.h>
-#include <string.h>

 #include <windows.h>
 #include <windows.h>

+#include <string.h>
+#include <wx/msw/taskbar.h>

 #include <wx/msw/private.h>
 
 #include <wx/msw/private.h>
 

+#ifndef __TWIN32__

 #ifdef __GNUWIN32__
 #include <wx/msw/gnuwin32/extra.h>
 #endif
 #ifdef __GNUWIN32__
 #include <wx/msw/gnuwin32/extra.h>
 #endif

+#endif
+
+#ifdef __SALFORDC__
+#include <shellapi.h>
+#endif

 
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                     UINT wParam, LONG lParam );
 
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                     UINT wParam, LONG lParam );


@@ -48,13 +57,13 @@ UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)

-    EVT_TASKBAR_MOVE         (wxTaskBarIcon::OnMouseMove)
-    EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::OnLButtonDown)
-    EVT_TASKBAR_LEFT_UP      (wxTaskBarIcon::OnLButtonUp)
-    EVT_TASKBAR_RIGHT_DOWN   (wxTaskBarIcon::OnRButtonDown)
-    EVT_TASKBAR_RIGHT_UP     (wxTaskBarIcon::OnRButtonUp)
-    EVT_TASKBAR_LEFT_DCLICK  (wxTaskBarIcon::OnLButtonDClick)
-    EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::OnRButtonDClick)
+    EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
+    EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
+    EVT_TASKBAR_LEFT_UP      (wxTaskBarIcon::_OnLButtonUp)
+    EVT_TASKBAR_RIGHT_DOWN   (wxTaskBarIcon::_OnRButtonDown)
+    EVT_TASKBAR_RIGHT_UP     (wxTaskBarIcon::_OnRButtonUp)
+    EVT_TASKBAR_LEFT_DCLICK  (wxTaskBarIcon::_OnLButtonDClick)
+    EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::_OnRButtonDClick)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -144,6 +153,25 @@ bool wxTaskBarIcon::RemoveIcon(void)
     return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0);
 }
 
     return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0);
 }
 

+bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
+{
+    bool        rval = FALSE;
+    wxWindow*   win;
+    int         x, y;
+    wxGetMousePosition(&x, &y);
+
+    // is wxFrame the best window type to use???
+    win = new wxFrame(NULL, -1, "", wxPoint(x,y), wxSize(-1,-1), 0);
+    win->PushEventHandler(this);
+
+    rval = win->PopupMenu(menu, 0, 0);
+
+    win->PopEventHandler(FALSE);
+    win->Destroy();
+    return rval;
+}
+
+

 // Overridables
 void wxTaskBarIcon::OnMouseMove(wxEvent&)
 {
 // Overridables
 void wxTaskBarIcon::OnMouseMove(wxEvent&)
 {


@@ -173,6 +201,15 @@ void wxTaskBarIcon::OnRButtonDClick(wxEvent&)
 {
 }
 
 {
 }
 

+void wxTaskBarIcon::_OnMouseMove(wxEvent& e)      { OnMouseMove(e);     }
+void wxTaskBarIcon::_OnLButtonDown(wxEvent& e)    { OnLButtonDown(e);   }
+void wxTaskBarIcon::_OnLButtonUp(wxEvent& e)      { OnLButtonUp(e);     }
+void wxTaskBarIcon::_OnRButtonDown(wxEvent& e)    { OnRButtonDown(e);   }
+void wxTaskBarIcon::_OnRButtonUp(wxEvent& e)      { OnRButtonUp(e);     }
+void wxTaskBarIcon::_OnLButtonDClick(wxEvent& e)  { OnLButtonDClick(e); }
+void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e)  { OnRButtonDClick(e); }
+
+

 wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd)
 {
     wxNode*node = sm_taskBarIcons.First();
 wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd)
 {
     wxNode*node = sm_taskBarIcons.First();