#include "wx/settings.h"
#include "wx/debug.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
/*
#define wxSYS_COLOUR_SCROLLBAR 0
#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-wxColour *g_systemBtnFaceColour = (wxColour *) NULL;
-wxColour *g_systemBtnShadowColour = (wxColour *) NULL;
-wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
-wxColour *g_systemHighlightColour = (wxColour *) NULL;
+//wxColour *g_systemWinColour = (wxColour *) NULL;
+wxColour *g_systemBtnFaceColour = (wxColour *) NULL;
+wxColour *g_systemBtnShadowColour = (wxColour *) NULL;
+wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
+wxColour *g_systemHighlightColour = (wxColour *) NULL;
+wxColour *g_systemHighlightTextColour = (wxColour *) NULL;
+wxColour *g_systemListBoxColour = (wxColour *) NULL;
wxFont *g_systemFont = (wxFont *) NULL;
void wxSystemSettings::Done()
{
- wxDELETE(g_systemBtnFaceColour);
- wxDELETE(g_systemBtnShadowColour);
- wxDELETE(g_systemBtnHighlightColour);
- wxDELETE(g_systemHighlightColour);
- wxDELETE(g_systemFont);
+// delete g_systemWinColour;
+ delete g_systemBtnFaceColour;
+ delete g_systemBtnShadowColour;
+ delete g_systemBtnHighlightColour;
+ delete g_systemHighlightColour;
+ delete g_systemHighlightTextColour;
+ delete g_systemListBoxColour;
+ delete g_systemFont;
}
wxColour wxSystemSettings::GetSystemColour( int index )
{
- switch (index)
- {
- case wxSYS_COLOUR_SCROLLBAR:
- case wxSYS_COLOUR_BACKGROUND:
- case wxSYS_COLOUR_ACTIVECAPTION:
- case wxSYS_COLOUR_INACTIVECAPTION:
- case wxSYS_COLOUR_MENU:
- case wxSYS_COLOUR_WINDOW:
- case wxSYS_COLOUR_WINDOWFRAME:
- case wxSYS_COLOUR_ACTIVEBORDER:
- case wxSYS_COLOUR_INACTIVEBORDER:
- case wxSYS_COLOUR_BTNFACE:
- {
- GtkStyle *style = gtk_widget_get_default_style();
- if (!g_systemBtnFaceColour)
- {
- g_systemBtnFaceColour =
- new wxColour( style->bg[0].red >> SHIFT,
- style->bg[0].green >> SHIFT,
- style->bg[0].blue >> SHIFT );
- }
- return *g_systemBtnFaceColour;
- }
- case wxSYS_COLOUR_BTNSHADOW:
- {
- GtkStyle *style = gtk_widget_get_default_style();
- if (!g_systemBtnShadowColour)
- {
- g_systemBtnShadowColour =
- new wxColour( style->dark[0].red >> SHIFT,
- style->dark[0].green >> SHIFT,
- style->dark[0].blue >> SHIFT );
- }
- return *g_systemBtnShadowColour;
- }
- case wxSYS_COLOUR_GRAYTEXT:
- case wxSYS_COLOUR_BTNHIGHLIGHT:
- {
- GtkStyle *style = gtk_widget_get_default_style();
- if (!g_systemBtnHighlightColour)
- {
- g_systemBtnHighlightColour =
- new wxColour( style->light[0].red >> SHIFT,
- style->light[0].green >> SHIFT,
- style->light[0].blue >> SHIFT );
- }
- return *g_systemBtnHighlightColour;
- }
- case wxSYS_COLOUR_HIGHLIGHT:
+ switch (index)
{
- GtkStyle *style = gtk_widget_get_default_style();
- if (!g_systemHighlightColour)
- {
- g_systemHighlightColour =
- new wxColour( style->bg[GTK_STATE_SELECTED].red >> SHIFT,
- style->bg[GTK_STATE_SELECTED].green >> SHIFT,
- style->bg[GTK_STATE_SELECTED].blue >> SHIFT );
- }
- return *g_systemHighlightColour;
- }
+ case wxSYS_COLOUR_SCROLLBAR:
+ case wxSYS_COLOUR_BACKGROUND:
+ case wxSYS_COLOUR_ACTIVECAPTION:
+ case wxSYS_COLOUR_INACTIVECAPTION:
+ case wxSYS_COLOUR_MENU:
+ case wxSYS_COLOUR_WINDOWFRAME:
+ case wxSYS_COLOUR_ACTIVEBORDER:
+ case wxSYS_COLOUR_INACTIVEBORDER:
+ case wxSYS_COLOUR_BTNFACE:
+ {
+ if (!g_systemBtnFaceColour)
+ {
+ g_systemBtnFaceColour =
+ new wxColour( 0xd6d6 >> SHIFT,
+ 0xd6d6 >> SHIFT,
+ 0xd6d6 >> SHIFT );
+ }
+ return *g_systemBtnFaceColour;
+ }
+ case wxSYS_COLOUR_WINDOW:
+ {
+ return *wxWHITE;
+ }
+ case wxSYS_COLOUR_GRAYTEXT:
+ case wxSYS_COLOUR_BTNSHADOW:
+ {
+ if (!g_systemBtnShadowColour)
+ {
+ g_systemBtnShadowColour =
+ new wxColour( 0x7530 >> SHIFT,
+ 0x7530 >> SHIFT,
+ 0x7530 >> SHIFT );
+ }
+ return *g_systemBtnShadowColour;
+ }
+ case wxSYS_COLOUR_BTNHIGHLIGHT:
+ {
+ if (!g_systemBtnHighlightColour)
+ {
+ g_systemBtnHighlightColour =
+ new wxColour( 0xea60 >> SHIFT,
+ 0xea60 >> SHIFT,
+ 0xea60 >> SHIFT );
+ }
+ return *g_systemBtnHighlightColour;
+ }
+ case wxSYS_COLOUR_HIGHLIGHT:
+ {
+ if (!g_systemHighlightColour)
+ {
+ GtkWidget *widget = gtk_button_new();
+ GtkStyle *def = gtk_rc_get_style( widget );
+ if (!def)
+ def = gtk_widget_get_default_style();
+ if (def)
+ {
+ int red = def->bg[GTK_STATE_SELECTED].red;
+ int green = def->bg[GTK_STATE_SELECTED].green;
+ int blue = def->bg[GTK_STATE_SELECTED].blue;
+ g_systemHighlightColour =
+ new wxColour( red >> SHIFT,
+ green >> SHIFT,
+ blue >> SHIFT );
+ }
+ else
+ {
+ g_systemHighlightColour =
+ new wxColour( 0 >> SHIFT,
+ 0 >> SHIFT,
+ 0x9c40 >> SHIFT );
+ }
+ gtk_widget_destroy( widget );
+
+ }
+ return *g_systemHighlightColour;
+ }
+ case wxSYS_COLOUR_LISTBOX:
+ {
+ if (!g_systemListBoxColour)
+ {
+ GtkWidget *widget = gtk_list_new();
+ GtkStyle *def = gtk_rc_get_style( widget );
+ if (!def)
+ def = gtk_widget_get_default_style();
+ if (def)
+ {
+ int red = def->base[GTK_STATE_NORMAL].red;
+ int green = def->base[GTK_STATE_NORMAL].green;
+ int blue = def->base[GTK_STATE_NORMAL].blue;
+ g_systemListBoxColour =
+ new wxColour( red >> SHIFT,
+ green >> SHIFT,
+ blue >> SHIFT );
+ }
+ else
+ g_systemListBoxColour = new wxColour(*wxWHITE);
+ gtk_widget_destroy( widget );
+ }
+ return *g_systemListBoxColour;
+ }
case wxSYS_COLOUR_MENUTEXT:
case wxSYS_COLOUR_WINDOWTEXT:
case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+ case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
{
return *wxBLACK;
}
case wxSYS_COLOUR_HIGHLIGHTTEXT:
{
- return *wxWHITE;
+ if (!g_systemHighlightTextColour)
+ {
+ wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+ if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
+ g_systemHighlightTextColour = new wxColour(*wxBLACK);
+ else
+ g_systemHighlightTextColour = new wxColour(*wxWHITE);
+ }
+ return *g_systemHighlightTextColour;
}
case wxSYS_COLOUR_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE:
wxFont wxSystemSettings::GetSystemFont( int index )
{
- switch (index)
- {
- case wxSYS_OEM_FIXED_FONT:
- case wxSYS_ANSI_FIXED_FONT:
- case wxSYS_SYSTEM_FIXED_FONT:
- {
- return *wxNORMAL_FONT;
- }
- case wxSYS_ANSI_VAR_FONT:
- case wxSYS_SYSTEM_FONT:
- case wxSYS_DEVICE_DEFAULT_FONT:
- case wxSYS_DEFAULT_GUI_FONT:
+ switch (index)
{
- if (!g_systemFont)
- g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
- return *g_systemFont;
+ case wxSYS_OEM_FIXED_FONT:
+ case wxSYS_ANSI_FIXED_FONT:
+ case wxSYS_SYSTEM_FIXED_FONT:
+ {
+ return *wxNORMAL_FONT;
+ }
+ case wxSYS_ANSI_VAR_FONT:
+ case wxSYS_SYSTEM_FONT:
+ case wxSYS_DEVICE_DEFAULT_FONT:
+ case wxSYS_DEFAULT_GUI_FONT:
+ {
+ if (!g_systemFont)
+ g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+ return *g_systemFont;
+ }
}
- }
- return wxNullFont;
+ return wxNullFont;
}
int wxSystemSettings::GetSystemMetric( int index )
case wxSYS_VSCROLL_X: return 15;
}
- wxCHECK_MSG( index, 0, "wxSystemSettings::GetSystemMetric not fully implemented" );
+ wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );
return 0;
}
projects / wxWidgets.git / blobdiff