/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
// 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
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)
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
{
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
{
}
}
case wxSYS_COLOUR_HIGHLIGHTTEXT:
+ case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:
{
return *wxWHITE;
}
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
{
default:
case wxSYS_COLOUR_MAX:
- wxFAIL_MSG( _T("unknown colour") );
+ wxFAIL_MSG( wxT("unknown colour") );
}
return *wxWHITE;
}
|| wxFont::GetDefaultEncoding() == wxFONTENCODING_EUC_JP)
pointSize = 15;
+ wxFont font;
+
switch (index)
{
case wxSYS_SYSTEM_FIXED_FONT:
{
- return wxFont(pointSize, wxMODERN, wxNORMAL, wxNORMAL, false);
+ font = wxFont(pointSize, wxMODERN, wxNORMAL, wxNORMAL, false);
break;
}
case wxSYS_DEVICE_DEFAULT_FONT:
case wxSYS_DEFAULT_GUI_FONT:
default:
{
- return wxFont(pointSize, wxSWISS, wxNORMAL, wxNORMAL, false);
+ font = wxFont(pointSize, wxSWISS, wxNORMAL, wxNORMAL, false);
break;
}
}
- return wxFont();
+ return font;
}
// Get a system metric, e.g. scrollbar size
case wxSYS_HSCROLL_Y:
case wxSYS_VSCROLL_X:
return 15;
-
+
case wxSYS_SCREEN_X:
return_value = DisplayWidth( wxGlobalDisplay(), 0 );
break;