summaryrefslogtreecommitdiff
path: root/src/wx/config_dialog.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-06-17 22:18:33 +0200
committerCarl Hetherington <cth@carlh.net>2020-07-26 00:59:11 +0200
commit94aadbd62c259a73d7511522dd167d519c68c5f9 (patch)
tree19de47515d54dd39076c234c1d8309b9f8a6e329 /src/wx/config_dialog.h
parent73ebb92e9df01ba7afb97121b6e2cef6ca13a18e (diff)
Add new macOS preferences icons.
Diffstat (limited to 'src/wx/config_dialog.h')
-rw-r--r--src/wx/config_dialog.h37
1 files changed, 17 insertions, 20 deletions
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 5203af609..f47408a4f 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -46,12 +46,14 @@
class AudioMappingView;
-class Page
+class Page : public wxPreferencesPage
{
public:
Page (wxSize panel_size, int border);
virtual ~Page () {}
+ wxWindow* CreateWindow (wxWindow* parent);
+
protected:
wxWindow* create_window (wxWindow* parent);
@@ -70,24 +72,19 @@ private:
bool _window_exists;
};
-class StockPage : public wxStockPreferencesPage, public Page
+class GeneralPage : public Page
{
public:
- StockPage (Kind kind, wxSize panel_size, int border);
- wxWindow* CreateWindow (wxWindow* parent);
-};
+ GeneralPage (wxSize panel_size, int border);
-class StandardPage : public wxPreferencesPage, public Page
-{
-public:
- StandardPage (wxSize panel_size, int border);
- wxWindow* CreateWindow (wxWindow* parent);
-};
+ wxString GetName () const;
-class GeneralPage : public StockPage
-{
-public:
- GeneralPage (wxSize panel_size, int border);
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
protected:
void add_language_controls (wxGridBagSizer* table, int& r);
@@ -150,11 +147,11 @@ private:
boost::function<bool (void)> _nag_alter;
};
-class KeysPage : public StandardPage
+class KeysPage : public Page
{
public:
KeysPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
{}
wxString GetName () const;
@@ -180,11 +177,11 @@ private:
};
-class SoundPage : public StandardPage
+class SoundPage : public Page
{
public:
SoundPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
{}
wxString GetName() const;
@@ -214,7 +211,7 @@ private:
Button* _reset_to_default;
};
-class LocationsPage : public StandardPage
+class LocationsPage : public Page
{
public:
LocationsPage (wxSize panel_size, int border);