Clarify wxButton::AdjustForBitmapSize() semantics in wxMSW.

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

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 108c8cfeb51457115ccde330d108ade6655b4110..34eead1c6f361a159d92f3ee12fbfeb93024c6a1 100644 (file)
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -81,9 +81,15 @@ public:
 protected:
 
     // Dummies for platform-specific wxTextEntry implementations
-#if defined(__WXGTK__)
+#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__)