projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot DeleteChildren()
[wxWidgets.git]
/
src
/
motif
/
settings.cpp
diff --git
a/src/motif/settings.cpp
b/src/motif/settings.cpp
index bda934ee21ecc661e1c04d89cfd7f19b9bd538d7..87ade0a057b508800b77f886d8cee18b1b8a93f2 100644
(file)
--- 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:
// Purpose: wxSettings
// Author: Julian Smart
// Modified by:
@@
-13,16
+13,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.
// 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"
// 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
#ifdef __VMS__
#pragma message disable nosimpint
@@
-45,7
+44,7
@@
wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
if (NULL == but_setting_wid && wxTheApp && wxTheApp->GetTopLevelWidget())
{
but_setting_wid = XtVaCreateWidget("settings_button", xmPushButtonWidgetClass,
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)
}
switch (index)
@@
-74,7
+73,9
@@
wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
XtVaGetValues(but_setting_wid,
XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg),
NULL);
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
{
}
else
{
@@
-117,7
+118,9
@@
wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
XtVaGetValues(but_setting_wid,
XtVaTypedArg, XmNforeground, XtRColor, &fg, sizeof(fg),
NULL);
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
{
}
else
{
@@
-137,7
+140,9
@@
wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
XtVaGetValues(but_setting_wid,
XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg),
NULL);
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
{
}
else
{
@@
-167,11
+172,13
@@
wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
|| wxFont::GetDefaultEncoding() == wxFONTENCODING_EUC_JP)
pointSize = 15;
|| wxFont::GetDefaultEncoding() == wxFONTENCODING_EUC_JP)
pointSize = 15;
+ wxFont font;
+
switch (index)
{
case wxSYS_SYSTEM_FIXED_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:
break;
}
case wxSYS_DEVICE_DEFAULT_FONT:
@@
-179,12
+186,12
@@
wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
case wxSYS_DEFAULT_GUI_FONT:
default:
{
case wxSYS_DEFAULT_GUI_FONT:
default:
{
-
return
wxFont(pointSize, wxSWISS, wxNORMAL, wxNORMAL, false);
+
font =
wxFont(pointSize, wxSWISS, wxNORMAL, wxNORMAL, false);
break;
}
}
break;
}
}
- return
wxFont()
;
+ return
font
;
}
// Get a system metric, e.g. scrollbar size
}
// Get a system metric, e.g. scrollbar size
@@
-197,7
+204,7
@@
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
case wxSYS_HSCROLL_Y:
case wxSYS_VSCROLL_X:
return 15;
case wxSYS_HSCROLL_Y:
case wxSYS_VSCROLL_X:
return 15;
-
+
case wxSYS_SCREEN_X:
return_value = DisplayWidth( wxGlobalDisplay(), 0 );
break;
case wxSYS_SCREEN_X:
return_value = DisplayWidth( wxGlobalDisplay(), 0 );
break;