added conversion to and from std::string and std::wstring (if wxUSE_STD_STRING)

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 4e758ba9cdcbd0bab7c12577b0437f606ab43b5d..e65781c7a4d9473f2e9d4c746e531b51c83b685b 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -160,7 +160,7 @@ public:
     // that the window object is passed instead of window handle) and should
     // return true if it handled the message or false if it should be passed to
     // DefWindowProc()
     // that the window object is passed instead of window handle) and should
     // return true if it handled the message or false if it should be passed to
     // DefWindowProc()

-    typedef bool (*MSWMessageHandler)(wxWindow *win,
+    typedef bool (*MSWMessageHandler)(wxWindowMSW *win,

                                       WXUINT nMsg,
                                       WXWPARAM wParam,
                                       WXLPARAM lParam);
                                       WXUINT nMsg,
                                       WXWPARAM wParam,
                                       WXLPARAM lParam);


@@ -201,7 +201,7 @@ public:
     wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     // MSW only: true if this control is part of the main control
     wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     // MSW only: true if this control is part of the main control

-    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
+    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }

 
 #if wxUSE_TOOLTIPS
     // MSW only: true if this window or any of its children have a tooltip
 
 #if wxUSE_TOOLTIPS
     // MSW only: true if this window or any of its children have a tooltip