Fix another line somehow missing from the wxGraphicsBitmap forward port.

[wxWidgets.git] / include / wx / generic / combo.h

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 6d19c7580818a12c8c56b4ef68cae7db2283e87f..703e42fa3afa87545161e8717acdd55dec98a925 100644 (file)
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -26,14 +26,14 @@
 // all actions of single line text controls are supported
 
 // popup/dismiss the choice window
-#define wxACTION_COMBOBOX_POPUP     _T("popup")
-#define wxACTION_COMBOBOX_DISMISS   _T("dismiss")
+#define wxACTION_COMBOBOX_POPUP     wxT("popup")
+#define wxACTION_COMBOBOX_DISMISS   wxT("dismiss")
 
 #endif
 
-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
-class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase
+class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
 {
 public:
     // ctors and such
@@ -65,6 +65,8 @@ public:
 
     virtual ~wxGenericComboCtrl();
 
+    void SetCustomPaintWidth( int width );
+
     virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
 
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
@@ -99,7 +101,7 @@ private:
 // If native wxComboCtrl was not defined, then prepare a simple
 // front-end so that wxRTTI works as expected.
 
-class WXDLLEXPORT wxComboCtrl : public wxGenericComboCtrl
+class WXDLLIMPEXP_CORE wxComboCtrl : public wxGenericComboCtrl
 {
 public:
     wxComboCtrl() : wxGenericComboCtrl() {}