define wxUSE_MFC as 0 if it's not defined (fixes gcc -Wundef warning)

[wxWidgets.git] / include / wx / msw / taskbar.h

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index d36e055b5c91aceae109254ff25d774caca190eb..bb374a70c306fb9ee77cf10711ea8ed849583b07 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -54,8 +54,7 @@ public:
 // Implementation
 protected:
     friend class wxTaskBarIconWindow;
 // Implementation
 protected:
     friend class wxTaskBarIconWindow;

-    long WindowProc(WXHWND hWnd, unsigned int msg,
-                    unsigned int wParam, long lParam);
+    long WindowProc(unsigned int msg, unsigned int wParam, long lParam);

     void RegisterWindowMessages();
 
 // Data members
     void RegisterWindowMessages();
 
 // Data members


@@ -67,19 +66,19 @@ protected:
 
 #if WXWIN_COMPATIBILITY_2_4
     // non-virtual default event handlers to forward events to the virtuals
 
 #if WXWIN_COMPATIBILITY_2_4
     // non-virtual default event handlers to forward events to the virtuals

-    void _OnMouseMove(wxEvent&);
-    void _OnLButtonDown(wxEvent&);
-    void _OnLButtonUp(wxEvent&);
-    void _OnRButtonDown(wxEvent&);
-    void _OnRButtonUp(wxEvent&);
-    void _OnLButtonDClick(wxEvent&);
-    void _OnRButtonDClick(wxEvent&);
+    void _OnMouseMove(wxTaskBarIconEvent&);
+    void _OnLButtonDown(wxTaskBarIconEvent&);
+    void _OnLButtonUp(wxTaskBarIconEvent&);
+    void _OnRButtonDown(wxTaskBarIconEvent&);
+    void _OnRButtonUp(wxTaskBarIconEvent&);
+    void _OnLButtonDClick(wxTaskBarIconEvent&);
+    void _OnRButtonDClick(wxTaskBarIconEvent&);

 
     DECLARE_EVENT_TABLE()
 #endif
 };
 
 
     DECLARE_EVENT_TABLE()
 #endif
 };
 

-#if WXWIN_COMPATIBILITY_2_4    
+#if WXWIN_COMPATIBILITY_2_4

 inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
 #endif
 
 inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
 #endif