Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxSYS_COLOUR_LISTBOX ; check to prevent wxSYS_COLOUR_HIGHLIGHT and HIGHLIGHT_TEXT being same

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-02-15 22:08:27 +00:00
parent 165b6ee097
commit 74f551959f
2 changed files with 84 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gtk/settings.cpp
View File

@@ -57,10 +57,12 @@
#define SHIFT (8*(sizeof(short int)-sizeof(char))) #define SHIFT (8*(sizeof(short int)-sizeof(char)))
//wxColour *g_systemWinColour = (wxColour *) NULL; //wxColour *g_systemWinColour = (wxColour *) NULL;
wxColour *g_systemBtnFaceColour = (wxColour *) NULL; wxColour *g_systemBtnFaceColour = (wxColour *) NULL;
wxColour *g_systemBtnShadowColour = (wxColour *) NULL; wxColour *g_systemBtnShadowColour = (wxColour *) NULL;
wxColour *g_systemBtnHighlightColour = (wxColour *) NULL; wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
wxColour *g_systemHighlightColour = (wxColour *) NULL; wxColour *g_systemHighlightColour = (wxColour *) NULL;
wxColour *g_systemHighlightTextColour = (wxColour *) NULL;
wxColour *g_systemListBoxColour = (wxColour *) NULL;
wxFont *g_systemFont = (wxFont *) NULL; wxFont *g_systemFont = (wxFont *) NULL;
@@ -71,6 +73,8 @@ void wxSystemSettings::Done()
delete g_systemBtnShadowColour; delete g_systemBtnShadowColour;
delete g_systemBtnHighlightColour; delete g_systemBtnHighlightColour;
delete g_systemHighlightColour; delete g_systemHighlightColour;
delete g_systemHighlightTextColour;
delete g_systemListBoxColour;
delete g_systemFont; delete g_systemFont;
} }
@@ -154,6 +158,31 @@ wxColour wxSystemSettings::GetSystemColour( int index )
} }
return *g_systemHighlightColour; 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->bg[GTK_STATE_NORMAL].red;
int green = def->bg[GTK_STATE_NORMAL].green;
int blue = def->bg[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_MENUTEXT:
case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_WINDOWTEXT:
case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_CAPTIONTEXT:
@@ -165,7 +194,15 @@ wxColour wxSystemSettings::GetSystemColour( int index )
} }
case wxSYS_COLOUR_HIGHLIGHTTEXT: 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_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE: case wxSYS_COLOUR_APPWORKSPACE:

47
src/gtk1/settings.cpp
View File

@@ -57,10 +57,12 @@
#define SHIFT (8*(sizeof(short int)-sizeof(char))) #define SHIFT (8*(sizeof(short int)-sizeof(char)))
//wxColour *g_systemWinColour = (wxColour *) NULL; //wxColour *g_systemWinColour = (wxColour *) NULL;
wxColour *g_systemBtnFaceColour = (wxColour *) NULL; wxColour *g_systemBtnFaceColour = (wxColour *) NULL;
wxColour *g_systemBtnShadowColour = (wxColour *) NULL; wxColour *g_systemBtnShadowColour = (wxColour *) NULL;
wxColour *g_systemBtnHighlightColour = (wxColour *) NULL; wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
wxColour *g_systemHighlightColour = (wxColour *) NULL; wxColour *g_systemHighlightColour = (wxColour *) NULL;
wxColour *g_systemHighlightTextColour = (wxColour *) NULL;
wxColour *g_systemListBoxColour = (wxColour *) NULL;
wxFont *g_systemFont = (wxFont *) NULL; wxFont *g_systemFont = (wxFont *) NULL;
@@ -71,6 +73,8 @@ void wxSystemSettings::Done()
delete g_systemBtnShadowColour; delete g_systemBtnShadowColour;
delete g_systemBtnHighlightColour; delete g_systemBtnHighlightColour;
delete g_systemHighlightColour; delete g_systemHighlightColour;
delete g_systemHighlightTextColour;
delete g_systemListBoxColour;
delete g_systemFont; delete g_systemFont;
} }
@@ -154,6 +158,31 @@ wxColour wxSystemSettings::GetSystemColour( int index )
} }
return *g_systemHighlightColour; 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->bg[GTK_STATE_NORMAL].red;
int green = def->bg[GTK_STATE_NORMAL].green;
int blue = def->bg[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_MENUTEXT:
case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_WINDOWTEXT:
case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_CAPTIONTEXT:
@@ -165,7 +194,15 @@ wxColour wxSystemSettings::GetSystemColour( int index )
} }
case wxSYS_COLOUR_HIGHLIGHTTEXT: 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_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE: case wxSYS_COLOUR_APPWORKSPACE: