X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0af4b6e41d2d7a9590282ec620fdbce0bf021f8a..f2a18fbec6f74bcb7957392f6e71982c8ca54568:/src/motif/settings.cpp diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp index a29bffc9b2..87ade0a057 100644 --- a/src/motif/settings.cpp +++ b/src/motif/settings.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: motif/settings.cpp +// Name: src/motif/settings.cpp // Purpose: wxSettings // Author: Julian Smart // Modified by: @@ -13,15 +13,40 @@ // per-user file, which can be edited using a Windows-control-panel clone. // Also they should be documented better. Some are very MS Windows-ish. -#ifdef __GNUG__ -#pragma implementation "settings.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/settings.h" -#include "wx/gdicmn.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/gdicmn.h" +#endif + +#ifdef __VMS__ +#pragma message disable nosimpint +#endif +#include +#include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif + +#include "wx/x11/privx.h" + +// 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 +59,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour 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 +67,20 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour 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((unsigned char)(bg.red >> 8), + (unsigned char)(bg.green >> 8), + (unsigned char)(bg.blue >> 8)); + } + else + { + return wxColour("LIGHT GREY"); + } } case wxSYS_COLOUR_BTNSHADOW: // case wxSYS_COLOUR_3DSHADOW: // Same as wxSYS_COLOUR_BTNSHADOW @@ -73,7 +112,20 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) 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((unsigned char)(fg.red >> 8), + (unsigned char)(fg.green >> 8), + (unsigned char)(fg.blue >> 8)); + } + else + { + return *wxBLACK; + } } case wxSYS_COLOUR_HIGHLIGHTTEXT: { @@ -82,14 +134,26 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_APPWORKSPACE: { - return wxColour("LIGHT GREY"); + if (but_setting_wid) + { + XColor bg; + XtVaGetValues(but_setting_wid, + XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg), + NULL); + return wxColor((unsigned char)(bg.red >> 8), + (unsigned char)(bg.green >> 8), + (unsigned char)(bg.blue >> 8)); + } + else + { + return wxColour("LIGHT GREY"); + } } case wxSYS_COLOUR_HOTLIGHT: case wxSYS_COLOUR_GRADIENTACTIVECAPTION: case wxSYS_COLOUR_GRADIENTINACTIVECAPTION: case wxSYS_COLOUR_MENUHILIGHT: - case wxSYS_COLOUR_MENUBAR: // TODO return wxColour("LIGHT GREY"); @@ -102,11 +166,19 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) { + int pointSize = 12; + + if ( wxFont::GetDefaultEncoding() == wxFONTENCODING_SHIFT_JIS + || wxFont::GetDefaultEncoding() == wxFONTENCODING_EUC_JP) + pointSize = 15; + + wxFont font; + switch (index) { case wxSYS_SYSTEM_FIXED_FONT: { - return wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, FALSE); + font = wxFont(pointSize, wxMODERN, wxNORMAL, wxNORMAL, false); break; } case wxSYS_DEVICE_DEFAULT_FONT: @@ -114,98 +186,71 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) case wxSYS_DEFAULT_GUI_FONT: default: { - return wxFont(12, wxSWISS, wxNORMAL, wxNORMAL, FALSE); + font = wxFont(pointSize, wxSWISS, wxNORMAL, wxNORMAL, false); break; } } - return wxFont(); + return font; } // Get a system metric, e.g. scrollbar size -int wxSystemSettingsNative::GetMetric(wxSystemMetric index) +int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) { + int return_value = 0; + switch ( index) { - case wxSYS_MOUSE_BUTTONS: - // TODO - case wxSYS_BORDER_X: - // TODO - case wxSYS_BORDER_Y: - // TODO - case wxSYS_CURSOR_X: - // TODO - case wxSYS_CURSOR_Y: - // TODO - case wxSYS_DCLICK_X: - // TODO - case wxSYS_DCLICK_Y: - // TODO - case wxSYS_DRAG_X: - // TODO - case wxSYS_DRAG_Y: - // TODO - case wxSYS_EDGE_X: - // TODO - case wxSYS_EDGE_Y: - // TODO - case wxSYS_HSCROLL_ARROW_X: - // TODO - case wxSYS_HSCROLL_ARROW_Y: - // TODO - case wxSYS_HTHUMB_X: - // TODO - case wxSYS_ICON_X: - // TODO - case wxSYS_ICON_Y: - // TODO - case wxSYS_ICONSPACING_X: - // TODO - case wxSYS_ICONSPACING_Y: - // TODO - case wxSYS_WINDOWMIN_X: - // TODO - case wxSYS_WINDOWMIN_Y: - // TODO - case wxSYS_SCREEN_X: - // TODO - case wxSYS_SCREEN_Y: - // TODO - case wxSYS_FRAMESIZE_X: - // TODO - case wxSYS_FRAMESIZE_Y: - // TODO - case wxSYS_SMALLICON_X: - // TODO - case wxSYS_SMALLICON_Y: - // TODO case wxSYS_HSCROLL_Y: - // TODO case wxSYS_VSCROLL_X: - // TODO - case wxSYS_VSCROLL_ARROW_X: - // TODO - case wxSYS_VSCROLL_ARROW_Y: - // TODO - case wxSYS_VTHUMB_Y: - // TODO - case wxSYS_CAPTION_Y: - // TODO - case wxSYS_MENU_Y: - // TODO - case wxSYS_NETWORK_PRESENT: - // TODO - case wxSYS_PENWINDOWS_PRESENT: - // TODO - case wxSYS_SHOW_SOUNDS: - // TODO - case wxSYS_SWAP_BUTTONS: - // TODO + return 15; + + case wxSYS_SCREEN_X: + return_value = DisplayWidth( wxGlobalDisplay(), 0 ); + break; + case wxSYS_SCREEN_Y: + return_value = DisplayHeight( wxGlobalDisplay(), 0 ); + break; + + // TODO case wxSYS_MOUSE_BUTTONS: + // TODO case wxSYS_BORDER_X: + // TODO case wxSYS_BORDER_Y: + // TODO case wxSYS_CURSOR_X: + // TODO case wxSYS_CURSOR_Y: + // TODO case wxSYS_DCLICK_X: + // TODO case wxSYS_DCLICK_Y: + // TODO case wxSYS_DRAG_X: + // TODO case wxSYS_DRAG_Y: + // TODO case wxSYS_EDGE_X: + // TODO case wxSYS_EDGE_Y: + // TODO case wxSYS_HSCROLL_ARROW_X: + // TODO case wxSYS_HSCROLL_ARROW_Y: + // TODO case wxSYS_HTHUMB_X: + // TODO case wxSYS_ICON_X: + // TODO case wxSYS_ICON_Y: + // TODO case wxSYS_ICONSPACING_X: + // TODO case wxSYS_ICONSPACING_Y: + // TODO case wxSYS_WINDOWMIN_X: + // TODO case wxSYS_WINDOWMIN_Y: + // TODO case wxSYS_FRAMESIZE_X: + // TODO case wxSYS_FRAMESIZE_Y: + // TODO case wxSYS_SMALLICON_X: + // TODO case wxSYS_SMALLICON_Y: + // TODO case wxSYS_VSCROLL_ARROW_X: + // TODO case wxSYS_VSCROLL_ARROW_Y: + // TODO case wxSYS_VTHUMB_Y: + // TODO case wxSYS_CAPTION_Y: + // TODO case wxSYS_MENU_Y: + // TODO case wxSYS_NETWORK_PRESENT: + // TODO case wxSYS_PENWINDOWS_PRESENT: + // TODO case wxSYS_SHOW_SOUNDS: + // TODO case wxSYS_SWAP_BUTTONS: + default: - ; + return_value = -1; // unsuported metric } - return 0; + return return_value; } bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) @@ -214,9 +259,9 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) { case wxSYS_CAN_ICONIZE_FRAME: case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return TRUE; + return true; default: - return FALSE; + return false; } }