Interface fixes for Phoenix

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

diff --git a/interface/wx/position.h b/interface/wx/position.h
index f723932f0a970f1d4041a0c71a7dba79dac22976..a85fd66fe3c90e728681df7791f6ad69669dd825 100644 (file)
--- a/interface/wx/position.h
+++ b/interface/wx/position.h
@@ -69,16 +69,16 @@ public:
 
         @{
     */
-    bool operator ==(const wxPosition& p) const;
-    bool operator !=(const wxPosition& p) const;
-    wxPosition& operator +=(const wxPosition& p) const;
-    wxPosition& operator -=(const wxPosition& p) const;
-    wxPosition& operator +=(const wxSize& s) const;
-    wxPosition& operator -=(const wxSize& s) const;
-    wxPosition& operator +(const wxPosition& p) const;
-    wxPosition& operator -(const wxPosition& p) const;
-    wxPosition& operator +(const wxSize& s) const;
-    wxPosition& operator -(const wxSize& s) const;
+    bool operator ==(const wxPosition& pos) const;
+    bool operator !=(const wxPosition& pos) const;
+    wxPosition& operator +=(const wxPosition& pos) const;
+    wxPosition& operator -=(const wxPosition& pos) const;
+    wxPosition& operator +=(const wxSize& size) const;
+    wxPosition& operator -=(const wxSize& size) const;
+    wxPosition operator +(const wxPosition& pos) const;
+    wxPosition operator -(const wxPosition& pos) const;
+    wxPosition operator +(const wxSize& size) const;
+    wxPosition operator -(const wxSize& size) const;
     //@}
 };
 

diff --git a/interface/wx/taskbar.h b/interface/wx/taskbar.h
index fbe78dafd022e6e6357baef1cc32eb86ef656a62..b6c37da4f7bc8900e0a51b58a787609601a17531 100644 (file)
--- a/interface/wx/taskbar.h
+++ b/interface/wx/taskbar.h
@@ -167,3 +167,14 @@ protected:
     virtual wxMenu* CreatePopupMenu();
 };
 
+
+wxEventType wxEVT_TASKBAR_MOVE;
+wxEventType wxEVT_TASKBAR_LEFT_DOWN;
+wxEventType wxEVT_TASKBAR_LEFT_UP;
+wxEventType wxEVT_TASKBAR_RIGHT_DOWN;
+wxEventType wxEVT_TASKBAR_RIGHT_UP;
+wxEventType wxEVT_TASKBAR_LEFT_DCLICK;
+wxEventType wxEVT_TASKBAR_RIGHT_DCLICK;
+wxEventType wxEVT_TASKBAR_CLICK;
+wxEventType wxEVT_TASKBAR_BALLOON_TIMEOUT;
+wxEventType wxEVT_TASKBAR_BALLOON_CLICK;