#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/gdicmn.h"
+#include "wx/module.h"
#endif
#include "wx/settings.h"
#include "wx/window.h"
#include "wx/os2/private.h"
+// the module which is used to clean up wxSystemSettings data (this is a
+// singleton class so it can't be done in the dtor)
+class wxSystemSettingsModule : public wxModule
+{
+ friend class wxSystemSettings;
+public:
+ virtual bool OnInit();
+ virtual void OnExit();
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+
+ static wxArrayString sm_optionNames;
+ static wxArrayString sm_optionValues;
+};
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+static wxFont *gs_fontDefault = NULL;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSystemSettingsModule
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+
+wxArrayString wxSystemSettingsModule::sm_optionNames;
+wxArrayString wxSystemSettingsModule::sm_optionValues;
+
+bool wxSystemSettingsModule::OnInit()
+{
+ return TRUE;
+}
+
+void wxSystemSettingsModule::OnExit()
+{
+ sm_optionNames.Clear();
+ sm_optionValues.Clear();
+ delete gs_fontDefault;
+}
+
wxColour wxSystemSettings::GetSystemColour(
int nIndex
)
,GetGValue(vRef)
,GetBValue(vRef)
);
- return vCol;
break;
case wxSYS_COLOUR_WINDOWFRAME:
,GetGValue(vRef)
,GetBValue(vRef)
);
- return vCol;
break;
case wxSYS_COLOUR_MENUTEXT:
,GetGValue(vRef)
,GetBValue(vRef)
);
- return vCol;
break;
case wxSYS_COLOUR_BTNSHADOW:
,GetGValue(vRef)
,GetBValue(vRef)
);
- return vCol;
break;
case wxSYS_COLOUR_BTNHIGHLIGHT:
,GetGValue(vRef)
,GetBValue(vRef)
);
- return vCol;
break;
//
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
- return(*wxBLACK);
+ vCol = (*wxBLACK);
break;
//
case wxSYS_COLOUR_ACTIVECAPTION:
case wxSYS_COLOUR_ACTIVEBORDER:
case wxSYS_COLOUR_HIGHLIGHT:
- return(*wxBLUE);
+ vCol = (*wxBLUE);
break;
case wxSYS_COLOUR_SCROLLBAR:
case wxSYS_COLOUR_3DDKSHADOW:
case wxSYS_COLOUR_3DLIGHT:
case wxSYS_COLOUR_INFOBK:
- return(*wxLIGHT_GREY);
+ vCol = (*wxLIGHT_GREY);
break;
default:
,GetGValue(vRef)
,GetBValue(vRef)
);
- return vCol;
break;
}
return(vCol);
break;
}
}
+ if(wxSWISS_FONT)
+ return *wxSWISS_FONT;
- return wxFont();
+ return wxNullFont;
}
// Get a system metric, e.g. scrollbar size