Instead of having wxComboCtrl mimic wxTextEntry interface, make it actually inherit from the class and implement functions to redirect to the embedded wxTextCtrl. This allows us to simplify the code and get rid of the dirty trick of directing wxComboCtrl's validator to the embedded wxTextCtrl. Also see #12779, which issue 1 is fixed by this change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -80,6 +80,16 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
// Dummies for platform-specific wxTextEntry implementations
|
||||
#if defined(__WXGTK__)
|
||||
virtual GtkEditable *GetEditable() const { return NULL; }
|
||||
virtual GtkEntry *GetEntry() const { return NULL; }
|
||||
#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();
|
||||
|
||||
|
Reference in New Issue
Block a user