compilation fix after wxBitmap image changes

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

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 9c5a0fc93e49dccfe45a6464b4bc50b03ab67507..5e1b753ee73e498e56a8645f6df1cf755f3fafff 100644 (file)
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -35,6 +35,10 @@
 
 #include "wx/msw/private.h"
 
+#if wxUSE_UXTHEME
+    #include "wx/msw/uxtheme.h"
+#endif
+
 #define GetEditHwnd() ((HWND)(GetEditHWND()))
 
 // ----------------------------------------------------------------------------
@@ -103,7 +107,7 @@ public:
 
             memcpy(olestr, wcbuf, size);
 
-            *rgelt++ = wx_static_cast(LPOLESTR, olestr);
+            *rgelt++ = static_cast<LPOLESTR>(olestr);
 
             ++(*pceltFetched);
         }
@@ -155,7 +159,7 @@ private:
     const wxArrayString m_strings;
     unsigned m_index;
 
-    DECLARE_NO_COPY_CLASS(wxIEnumString)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumString);
 };
 
 BEGIN_IID_TABLE(wxIEnumString)
@@ -180,7 +184,7 @@ void wxTextEntry::WriteText(const wxString& text)
     ::SendMessage(GetEditHwnd(), EM_REPLACESEL, 0, (LPARAM)text.wx_str());
 }
 
-wxString wxTextEntry::GetValue() const
+wxString wxTextEntry::DoGetValue() const
 {
     return wxGetWindowText(GetEditHWND());
 }
@@ -341,7 +345,7 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
                     NULL,
                     CLSCTX_INPROC_SERVER,
                     IID_IAutoComplete,
-                    wx_reinterpret_cast(void **, &pAutoComplete)
+                    reinterpret_cast<void **>(&pAutoComplete)
                  );
     if ( FAILED(hr) )
     {
@@ -365,7 +369,7 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
     hr = pAutoComplete->QueryInterface
                         (
                            IID_IAutoComplete2,
-                           wx_reinterpret_cast(void **, &pAutoComplete2)
+                           reinterpret_cast<void **>(&pAutoComplete2)
                         );
     if ( SUCCEEDED(hr) )
     {
@@ -416,4 +420,44 @@ void wxTextEntry::SetMaxLength(unsigned long len)
     ::SendMessage(GetEditHwnd(), EM_LIMITTEXT, len, 0);
 }
 
+// ----------------------------------------------------------------------------
+// hints
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UXTHEME
+
+#ifndef EM_SETCUEBANNER
+    #define EM_SETCUEBANNER 0x1501
+    #define EM_GETCUEBANNER 0x1502
+#endif
+
+bool wxTextEntry::SetHint(const wxString& hint)
+{
+    if ( wxUxThemeEngine::GetIfActive() )
+    {
+        // notice that this message always works with Unicode strings
+        if ( ::SendMessage(GetEditHwnd(), EM_SETCUEBANNER,
+                             0, (LPARAM)(const wchar_t *)hint.wc_str()) )
+            return true;
+    }
+
+    return wxTextEntryBase::SetHint(hint);
+}
+
+wxString wxTextEntry::GetHint() const
+{
+    if ( wxUxThemeEngine::GetIfActive() )
+    {
+        wchar_t buf[256];
+        if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
+                            (WPARAM)buf, WXSIZEOF(buf)) )
+            return wxString(buf);
+    }
+
+    return wxTextEntryBase::GetHint();
+}
+
+
+#endif // wxUSE_UXTHEME
+
 #endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX