Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid some GTK+ run-time errors when using wx{File,Dir}PickerCtrl

Browse Source 
The wxGTK implementation uses wx{File,Dir}Button, which derives from
wxButton, but is not a GtkButton, so many operations which try to modify
it, such as changing it's style, are likely to result in errors.
See #17984
This commit is contained in:
Paul Cornett
2017-11-03 11:45:50 -07:00
parent 84b2ba40ee
commit d57d9ffaf7
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/filepicker.h
View File

@@ -101,6 +101,8 @@ public: // overrides
protected: protected:
wxDialog *m_dialog; wxDialog *m_dialog;
virtual void DoApplyWidgetStyle(GtkRcStyle*) wxOVERRIDE;
private: private:
// common part of all ctors // common part of all ctors
void Init() { m_dialog = NULL; } void Init() { m_dialog = NULL; }
@@ -170,6 +172,8 @@ public: // overrides
protected: protected:
wxDialog *m_dialog; wxDialog *m_dialog;
virtual void DoApplyWidgetStyle(GtkRcStyle*) wxOVERRIDE;
public: // used by the GTK callback only public: // used by the GTK callback only
bool m_bIgnoreNextChange; bool m_bIgnoreNextChange;

6
src/gtk/filepicker.cpp
View File

@@ -158,6 +158,9 @@ void wxFileButton::SetInitialDirectory(const wxString& dir)
wxGenericFileButton::SetInitialDirectory(dir); wxGenericFileButton::SetInitialDirectory(dir);
} }
void wxFileButton::DoApplyWidgetStyle(GtkRcStyle*)
{
}
#endif // wxUSE_FILEPICKERCTRL #endif // wxUSE_FILEPICKERCTRL
#if wxUSE_DIRPICKERCTRL #if wxUSE_DIRPICKERCTRL
@@ -331,4 +334,7 @@ void wxDirButton::SetInitialDirectory(const wxString& dir)
wxGenericDirButton::SetInitialDirectory(dir); wxGenericDirButton::SetInitialDirectory(dir);
} }
void wxDirButton::DoApplyWidgetStyle(GtkRcStyle*)
{
}
#endif // wxUSE_DIRPICKERCTRL #endif // wxUSE_DIRPICKERCTRL