X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1248b41f9f71110347659db8c54c75786eba23c6..0d1903dbda864780eec30efdc4e91776bdbfd21b:/src/motif/settings.cpp diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp index 054bc38821..4e3e10dded 100644 --- a/src/motif/settings.cpp +++ b/src/motif/settings.cpp @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: motif/settings.cpp +// Name: src/motif/settings.cpp // Purpose: wxSettings // Author: Julian Smart // Modified by: // Created: 17/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,16 +12,15 @@ // 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. -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#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" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/gdicmn.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -45,7 +43,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) if (NULL == but_setting_wid && wxTheApp && wxTheApp->GetTopLevelWidget()) { but_setting_wid = XtVaCreateWidget("settings_button", xmPushButtonWidgetClass, - (Widget)wxTheApp->GetTopLevelWidget(), NULL); + (Widget)wxTheApp->GetTopLevelWidget(), NULL); } switch (index) @@ -74,7 +72,9 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) XtVaGetValues(but_setting_wid, XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg), NULL); - return wxColor(bg.red >> 8, bg.green >> 8, bg.blue >> 8); + return wxColor((unsigned char)(bg.red >> 8), + (unsigned char)(bg.green >> 8), + (unsigned char)(bg.blue >> 8)); } else { @@ -117,7 +117,9 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) XtVaGetValues(but_setting_wid, XtVaTypedArg, XmNforeground, XtRColor, &fg, sizeof(fg), NULL); - return wxColor(fg.red >> 8, fg.green >> 8, fg.blue >> 8); + return wxColor((unsigned char)(fg.red >> 8), + (unsigned char)(fg.green >> 8), + (unsigned char)(fg.blue >> 8)); } else { @@ -125,6 +127,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) } } case wxSYS_COLOUR_HIGHLIGHTTEXT: + case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT: { return *wxWHITE; } @@ -137,7 +140,9 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) XtVaGetValues(but_setting_wid, XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg), NULL); - return wxColor(bg.red >> 8, bg.green >> 8, bg.blue >> 8); + return wxColor((unsigned char)(bg.red >> 8), + (unsigned char)(bg.green >> 8), + (unsigned char)(bg.blue >> 8)); } else { @@ -154,18 +159,26 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) default: case wxSYS_COLOUR_MAX: - wxFAIL_MSG( _T("unknown colour") ); + wxFAIL_MSG( wxT("unknown colour") ); } return *wxWHITE; } 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: @@ -173,16 +186,16 @@ 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; @@ -191,80 +204,50 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index) case wxSYS_HSCROLL_Y: case wxSYS_VSCROLL_X: return 15; - 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: - break; + case wxSYS_SCREEN_X: return_value = DisplayWidth( wxGlobalDisplay(), 0 ); break; case wxSYS_SCREEN_Y: return_value = DisplayHeight( wxGlobalDisplay(), 0 ); break; - 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: - // TODO + + // 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 return_value; @@ -276,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; } }