Forward declare classes instead of including their declarations.

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

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 913511fcbfb8caeeefaad44bc33a964cc698538e..34eead1c6f361a159d92f3ee12fbfeb93024c6a1 100644 (file)
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -26,8 +26,8 @@
 // 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
 
@@ -80,6 +80,22 @@ public:
 
 protected:
 
+    // Dummies for platform-specific wxTextEntry implementations
+#if defined(__WXUNIVERSAL__)
+    // Looks like there's nothing we need to override here
+#elif defined(__WXMOTIF__)
+    virtual WXWidget GetTextWidget() const { return NULL; }
+#elif defined(__WXGTK__)
+#if defined(__WXGTK20__)
+    virtual GtkEditable *GetEditable() const { return NULL; }
+    virtual GtkEntry *GetEntry() const { return NULL; }
+#endif
+#elif defined(__WXMAC__)
+    // Looks like there's nothing we need to override here
+#elif defined(__WXPM__)
+    virtual WXHWND GetEditHWND() const { return NULL; }
+#endif
+
     // Mandatory virtuals
     virtual void OnResize();