X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/253293c10326afa0226932eab4753d188e1e22e2..adb45366da2cb1ee72f548ab2fa149f071327682:/src/motif/settings.cpp diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp index b75b68efc9..e8d4c9b01b 100644 --- a/src/motif/settings.cpp +++ b/src/motif/settings.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.cpp +// Name: motif/settings.cpp // Purpose: wxSettings // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // TODO: these settings should probably be configurable from some central or @@ -19,9 +19,30 @@ #include "wx/settings.h" #include "wx/gdicmn.h" +#include "wx/app.h" -wxColour wxSystemSettings::GetSystemColour(int index) +#ifdef __VMS__ +#pragma message disable nosimpint +#endif +#include +#include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif + +// To correctly read the resources from the database, we create a +// sample widget. This has the application shell as the parent and +// so will be destroyed when the applicaion is closed. +static Widget but_setting_wid = NULL; + +wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) { + if (NULL == but_setting_wid && wxTheApp && wxTheApp->GetTopLevelWidget()) + { + but_setting_wid = XtVaCreateWidget("settings_button", xmPushButtonWidgetClass, + (Widget)wxTheApp->GetTopLevelWidget(), NULL); + } + switch (index) { case wxSYS_COLOUR_WINDOW: @@ -34,6 +55,7 @@ wxColour wxSystemSettings::GetSystemColour(int index) case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_INACTIVECAPTION: case wxSYS_COLOUR_MENU: + case wxSYS_COLOUR_MENUBAR: case wxSYS_COLOUR_WINDOWFRAME: case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER: @@ -41,7 +63,18 @@ wxColour wxSystemSettings::GetSystemColour(int index) // case wxSYS_COLOUR_3DFACE: // Same as wxSYS_COLOUR_BTNFACE case wxSYS_COLOUR_GRAYTEXT: { - return wxColour("LIGHT GREY"); + if (but_setting_wid) + { + XColor bg; + XtVaGetValues(but_setting_wid, + XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg), + NULL); + return wxColor(bg.red >> 8, bg.green >> 8, bg.blue >> 8); + } + else + { + return wxColour("LIGHT GREY"); + } } case wxSYS_COLOUR_BTNSHADOW: // case wxSYS_COLOUR_3DSHADOW: // Same as wxSYS_COLOUR_BTNSHADOW @@ -57,8 +90,8 @@ wxColour wxSystemSettings::GetSystemColour(int index) return *wxBLUE; } case wxSYS_COLOUR_BTNHIGHLIGHT: - case wxSYS_COLOUR_LISTBOX: - // case wxSYS_COLOUR_3DHIGHLIGHT: // Same as wxSYS_COLOUR_BTNHIGHLIGHT + case wxSYS_COLOUR_LISTBOX: + // case wxSYS_COLOUR_3DHIGHLIGHT: // Same as wxSYS_COLOUR_BTNHIGHLIGHT { return *wxWHITE; } @@ -70,9 +103,21 @@ wxColour wxSystemSettings::GetSystemColour(int index) case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT: + case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_INFOTEXT: { - return *wxBLACK; + if (but_setting_wid) + { + XColor fg; + XtVaGetValues(but_setting_wid, + XtVaTypedArg, XmNforeground, XtRColor, &fg, sizeof(fg), + NULL); + return wxColor(fg.red >> 8, fg.green >> 8, fg.blue >> 8); + } + else + { + return *wxBLACK; + } } case wxSYS_COLOUR_HIGHLIGHTTEXT: { @@ -81,14 +126,35 @@ wxColour wxSystemSettings::GetSystemColour(int index) case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_APPWORKSPACE: { - return wxColour("LIGHT GREY"); - // return *wxWHITE; + if (but_setting_wid) + { + XColor bg; + XtVaGetValues(but_setting_wid, + XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg), + NULL); + return wxColor(bg.red >> 8, bg.green >> 8, bg.blue >> 8); + } + else + { + return wxColour("LIGHT GREY"); + } } + + case wxSYS_COLOUR_HOTLIGHT: + case wxSYS_COLOUR_GRADIENTACTIVECAPTION: + case wxSYS_COLOUR_GRADIENTINACTIVECAPTION: + case wxSYS_COLOUR_MENUHILIGHT: + // TODO + return wxColour("LIGHT GREY"); + + default: + case wxSYS_COLOUR_MAX: + wxFAIL_MSG( _T("unknown colour") ); } return *wxWHITE; } -wxFont wxSystemSettings::GetSystemFont(int index) +wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) { switch (index) { @@ -111,133 +177,99 @@ wxFont wxSystemSettings::GetSystemFont(int index) } // Get a system metric, e.g. scrollbar size -int wxSystemSettings::GetSystemMetric(int index) +int wxSystemSettingsNative::GetMetric(wxSystemMetric index) { - switch ( index) - { + switch ( index) + { case wxSYS_MOUSE_BUTTONS: // TODO - return 0; case wxSYS_BORDER_X: // TODO - return 0; case wxSYS_BORDER_Y: // TODO - return 0; case wxSYS_CURSOR_X: // TODO - return 0; case wxSYS_CURSOR_Y: // TODO - return 0; case wxSYS_DCLICK_X: // TODO - return 0; case wxSYS_DCLICK_Y: // TODO - return 0; case wxSYS_DRAG_X: // TODO - return 0; case wxSYS_DRAG_Y: // TODO - return 0; case wxSYS_EDGE_X: // TODO - return 0; case wxSYS_EDGE_Y: // TODO - return 0; case wxSYS_HSCROLL_ARROW_X: // TODO - return 0; case wxSYS_HSCROLL_ARROW_Y: // TODO - return 0; case wxSYS_HTHUMB_X: // TODO - return 0; case wxSYS_ICON_X: // TODO - return 0; case wxSYS_ICON_Y: // TODO - return 0; case wxSYS_ICONSPACING_X: // TODO - return 0; case wxSYS_ICONSPACING_Y: // TODO - return 0; case wxSYS_WINDOWMIN_X: // TODO - return 0; case wxSYS_WINDOWMIN_Y: // TODO - return 0; case wxSYS_SCREEN_X: // TODO - return 0; case wxSYS_SCREEN_Y: // TODO - return 0; case wxSYS_FRAMESIZE_X: // TODO - return 0; case wxSYS_FRAMESIZE_Y: // TODO - return 0; case wxSYS_SMALLICON_X: // TODO - return 0; case wxSYS_SMALLICON_Y: // TODO - return 0; case wxSYS_HSCROLL_Y: // TODO - return 0; case wxSYS_VSCROLL_X: // TODO - return 0; case wxSYS_VSCROLL_ARROW_X: // TODO - return 0; case wxSYS_VSCROLL_ARROW_Y: // TODO - return 0; case wxSYS_VTHUMB_Y: // TODO - return 0; case wxSYS_CAPTION_Y: // TODO - return 0; case wxSYS_MENU_Y: // TODO - return 0; case wxSYS_NETWORK_PRESENT: // TODO - return 0; case wxSYS_PENWINDOWS_PRESENT: // TODO - return 0; case wxSYS_SHOW_SOUNDS: // TODO - return 0; case wxSYS_SWAP_BUTTONS: // TODO - return 0; - default: - return 0; - } + default: + ; + } + + return 0; } -bool wxSystemSettings::GetCapability(int index) +bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) { switch (index) { - case wxSYS_CAN_ICONIZE_FRAME: + case wxSYS_CAN_ICONIZE_FRAME: case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return TRUE; break; + return TRUE; + default: return FALSE; }