Get SetLabel working again for wxStaticText by overriding SetLabel so that we can...

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index e96d4d95c47a0a1e628cffc2297b3be610223c0f..8339b4cb0c65b635f51d0414760eb607bc20e826 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -116,6 +116,11 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

+#if wxUSE_UXTHEME
+    // override wxTextEntry method to work around Windows bug
+    virtual bool SetHint(const wxString& hint);
+#endif // wxUSE_UXTHEME
+

 protected:
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip(wxToolTip *tip);
 protected:
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip(wxToolTip *tip);


@@ -136,8 +141,9 @@ protected:
     }
 
 private:
     }
 
 private:

-    // this is the overridden wxTextEntry method which should only be called
-    // when we do have an edit control so it asserts if this is not the case
+    // there are the overridden wxTextEntry methods which should only be called
+    // when we do have an edit control so they assert if this is not the case
+    virtual wxWindow *GetEditableWindow();

     virtual WXHWND GetEditHWND() const;
 
     // common part of all ctors
     virtual WXHWND GetEditHWND() const;
 
     // common part of all ctors