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

extracted 4 copies of identical code into a function

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-08-20 14:13:04 +00:00
parent 783d4c8931
commit 643ccf6203
2 changed files with 220 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
src/gtk/settings.cpp
View File

@@ -86,6 +86,42 @@ void wxSystemSettings::Done()
delete g_systemBtnTextColour; delete g_systemBtnTextColour;
} }
// kind of widget to use in GetColourFromGTKWidget
enum GtkWidgetType
{
GTK_BUTTON,
GTK_LIST
};
// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
// widget style, return true if we did get them, false to use defaults
static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state,
int& red, int& green, int& blue)
{
GtkWidget *widget = type == GTK_BUTTON ? gtk_button_new() : gtk_list_new();
GtkStyle *def = gtk_rc_get_style( widget );
if ( !def )
def = gtk_widget_get_default_style();
bool ok;
if ( def )
{
red = def->bg[state].red;
green = def->bg[state].green;
blue = def->bg[state].blue;
ok = TRUE;
}
else
{
ok = FALSE;
}
gtk_widget_destroy( widget );
return ok;
}
wxColour wxSystemSettings::GetSystemColour( int index ) wxColour wxSystemSettings::GetSystemColour( int index )
{ {
switch (index) switch (index)
@@ -100,57 +136,32 @@ wxColour wxSystemSettings::GetSystemColour( int index )
case wxSYS_COLOUR_INACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER:
case wxSYS_COLOUR_BTNFACE: case wxSYS_COLOUR_BTNFACE:
case wxSYS_COLOUR_3DLIGHT: case wxSYS_COLOUR_3DLIGHT:
{
if (!g_systemBtnFaceColour) if (!g_systemBtnFaceColour)
{ {
GtkWidget *widget = gtk_button_new(); int red, green, blue;
GtkStyle *def = gtk_rc_get_style( widget ); if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_NORMAL,
if (!def) red, green, blue) )
def = gtk_widget_get_default_style();
if (def)
{ {
int red = def->bg[GTK_STATE_NORMAL].red; red =
int green = def->bg[GTK_STATE_NORMAL].green; green = 0;
int blue = def->bg[GTK_STATE_NORMAL].blue; blue = 0x9c40;
g_systemBtnFaceColour = }
new wxColour( red >> SHIFT,
g_systemBtnFaceColour = new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
blue >> SHIFT ); blue >> SHIFT );
} }
else return *g_systemBtnFaceColour;
{
g_systemBtnFaceColour =
new wxColour( 0 >> SHIFT,
0 >> SHIFT,
0x9c40 >> SHIFT );
}
gtk_widget_destroy( widget );
}
return *g_systemBtnFaceColour;
/*
if (!g_systemBtnFaceColour)
{
g_systemBtnFaceColour =
new wxColour( 0xd6d6 >> SHIFT,
0xd6d6 >> SHIFT,
0xd6d6 >> SHIFT );
}
return *g_systemBtnFaceColour;
*/
}
case wxSYS_COLOUR_WINDOW: case wxSYS_COLOUR_WINDOW:
{
return *wxWHITE; return *wxWHITE;
}
case wxSYS_COLOUR_3DDKSHADOW: case wxSYS_COLOUR_3DDKSHADOW:
{
return *wxBLACK; return *wxBLACK;
}
case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_GRAYTEXT:
case wxSYS_COLOUR_BTNSHADOW: case wxSYS_COLOUR_BTNSHADOW:
//case wxSYS_COLOUR_3DSHADOW: //case wxSYS_COLOUR_3DSHADOW:
{
if (!g_systemBtnShadowColour) if (!g_systemBtnShadowColour)
{ {
wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
@@ -159,22 +170,15 @@ wxColour wxSystemSettings::GetSystemColour( int index )
(unsigned char) (faceColour.Green() * 0.666), (unsigned char) (faceColour.Green() * 0.666),
(unsigned char) (faceColour.Blue() * 0.666)); (unsigned char) (faceColour.Blue() * 0.666));
} }
/*
if (!g_systemBtnShadowColour)
{
g_systemBtnShadowColour =
new wxColour( 0x7530 >> SHIFT,
0x7530 >> SHIFT,
0x7530 >> SHIFT );
}
*/
return *g_systemBtnShadowColour; return *g_systemBtnShadowColour;
}
case wxSYS_COLOUR_3DHIGHLIGHT: case wxSYS_COLOUR_3DHIGHLIGHT:
//case wxSYS_COLOUR_BTNHIGHLIGHT: //case wxSYS_COLOUR_BTNHIGHLIGHT:
{
return * wxWHITE; return * wxWHITE;
/* I think this should normally be white (JACS 8/2000) /* I think this should normally be white (JACS 8/2000)
Hmm, I'm quite sure it shouldn't ... (VZ 20.08.01)
if (!g_systemBtnHighlightColour) if (!g_systemBtnHighlightColour)
{ {
g_systemBtnHighlightColour = g_systemBtnHighlightColour =
@@ -184,68 +188,49 @@ wxColour wxSystemSettings::GetSystemColour( int index )
} }
return *g_systemBtnHighlightColour; return *g_systemBtnHighlightColour;
*/ */
}
case wxSYS_COLOUR_HIGHLIGHT: case wxSYS_COLOUR_HIGHLIGHT:
{
if (!g_systemHighlightColour) if (!g_systemHighlightColour)
{ {
GtkWidget *widget = gtk_button_new(); int red, green, blue;
GtkStyle *def = gtk_rc_get_style( widget ); if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_SELECTED,
if (!def) red, green, blue) )
def = gtk_widget_get_default_style();
if (def)
{ {
int red = def->bg[GTK_STATE_SELECTED].red; red =
int green = def->bg[GTK_STATE_SELECTED].green; green = 0;
int blue = def->bg[GTK_STATE_SELECTED].blue; blue = 0x9c40;
g_systemHighlightColour = }
new wxColour( red >> SHIFT,
g_systemHighlightColour = new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
blue >> SHIFT ); blue >> SHIFT );
} }
else
{
g_systemHighlightColour =
new wxColour( 0 >> SHIFT,
0 >> SHIFT,
0x9c40 >> SHIFT );
}
gtk_widget_destroy( widget );
}
return *g_systemHighlightColour; return *g_systemHighlightColour;
}
case wxSYS_COLOUR_LISTBOX: case wxSYS_COLOUR_LISTBOX:
{
if (!g_systemListBoxColour) if (!g_systemListBoxColour)
{ {
GtkWidget *widget = gtk_list_new(); int red, green, blue;
GtkStyle *def = gtk_rc_get_style( widget ); if ( GetColourFromGTKWidget(GTK_LIST, GTK_STATE_NORMAL,
if (!def) red, green, blue) )
def = gtk_widget_get_default_style();
if (def)
{ {
int red = def->base[GTK_STATE_NORMAL].red; g_systemListBoxColour = new wxColour( red >> SHIFT,
int green = def->base[GTK_STATE_NORMAL].green;
int blue = def->base[GTK_STATE_NORMAL].blue;
g_systemListBoxColour =
new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
blue >> SHIFT ); blue >> SHIFT );
} }
else else
{
g_systemListBoxColour = new wxColour(*wxWHITE); g_systemListBoxColour = new wxColour(*wxWHITE);
gtk_widget_destroy( widget ); }
} }
return *g_systemListBoxColour; 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:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT: case wxSYS_COLOUR_INFOTEXT:
{
if (!g_systemBtnTextColour) if (!g_systemBtnTextColour)
{ {
GtkWidget *widget = gtk_button_new(); GtkWidget *widget = gtk_button_new();
@@ -270,9 +255,8 @@ wxColour wxSystemSettings::GetSystemColour( int index )
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
} }
return *g_systemBtnTextColour; return *g_systemBtnTextColour;
}
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
{
if (!g_systemHighlightTextColour) if (!g_systemHighlightTextColour)
{ {
wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
@@ -282,13 +266,12 @@ wxColour wxSystemSettings::GetSystemColour( int index )
g_systemHighlightTextColour = new wxColour(*wxWHITE); g_systemHighlightTextColour = new wxColour(*wxWHITE);
} }
return *g_systemHighlightTextColour; return *g_systemHighlightTextColour;
}
case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE: case wxSYS_COLOUR_APPWORKSPACE:
{
return *wxWHITE; // ? return *wxWHITE; // ?
} }
}
return *wxWHITE; return *wxWHITE;
} }

163
src/gtk1/settings.cpp
View File

@@ -86,6 +86,42 @@ void wxSystemSettings::Done()
delete g_systemBtnTextColour; delete g_systemBtnTextColour;
} }
// kind of widget to use in GetColourFromGTKWidget
enum GtkWidgetType
{
GTK_BUTTON,
GTK_LIST
};
// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
// widget style, return true if we did get them, false to use defaults
static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state,
int& red, int& green, int& blue)
{
GtkWidget *widget = type == GTK_BUTTON ? gtk_button_new() : gtk_list_new();
GtkStyle *def = gtk_rc_get_style( widget );
if ( !def )
def = gtk_widget_get_default_style();
bool ok;
if ( def )
{
red = def->bg[state].red;
green = def->bg[state].green;
blue = def->bg[state].blue;
ok = TRUE;
}
else
{
ok = FALSE;
}
gtk_widget_destroy( widget );
return ok;
}
wxColour wxSystemSettings::GetSystemColour( int index ) wxColour wxSystemSettings::GetSystemColour( int index )
{ {
switch (index) switch (index)
@@ -100,57 +136,32 @@ wxColour wxSystemSettings::GetSystemColour( int index )
case wxSYS_COLOUR_INACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER:
case wxSYS_COLOUR_BTNFACE: case wxSYS_COLOUR_BTNFACE:
case wxSYS_COLOUR_3DLIGHT: case wxSYS_COLOUR_3DLIGHT:
{
if (!g_systemBtnFaceColour) if (!g_systemBtnFaceColour)
{ {
GtkWidget *widget = gtk_button_new(); int red, green, blue;
GtkStyle *def = gtk_rc_get_style( widget ); if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_NORMAL,
if (!def) red, green, blue) )
def = gtk_widget_get_default_style();
if (def)
{ {
int red = def->bg[GTK_STATE_NORMAL].red; red =
int green = def->bg[GTK_STATE_NORMAL].green; green = 0;
int blue = def->bg[GTK_STATE_NORMAL].blue; blue = 0x9c40;
g_systemBtnFaceColour = }
new wxColour( red >> SHIFT,
g_systemBtnFaceColour = new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
blue >> SHIFT ); blue >> SHIFT );
} }
else return *g_systemBtnFaceColour;
{
g_systemBtnFaceColour =
new wxColour( 0 >> SHIFT,
0 >> SHIFT,
0x9c40 >> SHIFT );
}
gtk_widget_destroy( widget );
}
return *g_systemBtnFaceColour;
/*
if (!g_systemBtnFaceColour)
{
g_systemBtnFaceColour =
new wxColour( 0xd6d6 >> SHIFT,
0xd6d6 >> SHIFT,
0xd6d6 >> SHIFT );
}
return *g_systemBtnFaceColour;
*/
}
case wxSYS_COLOUR_WINDOW: case wxSYS_COLOUR_WINDOW:
{
return *wxWHITE; return *wxWHITE;
}
case wxSYS_COLOUR_3DDKSHADOW: case wxSYS_COLOUR_3DDKSHADOW:
{
return *wxBLACK; return *wxBLACK;
}
case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_GRAYTEXT:
case wxSYS_COLOUR_BTNSHADOW: case wxSYS_COLOUR_BTNSHADOW:
//case wxSYS_COLOUR_3DSHADOW: //case wxSYS_COLOUR_3DSHADOW:
{
if (!g_systemBtnShadowColour) if (!g_systemBtnShadowColour)
{ {
wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
@@ -159,22 +170,15 @@ wxColour wxSystemSettings::GetSystemColour( int index )
(unsigned char) (faceColour.Green() * 0.666), (unsigned char) (faceColour.Green() * 0.666),
(unsigned char) (faceColour.Blue() * 0.666)); (unsigned char) (faceColour.Blue() * 0.666));
} }
/*
if (!g_systemBtnShadowColour)
{
g_systemBtnShadowColour =
new wxColour( 0x7530 >> SHIFT,
0x7530 >> SHIFT,
0x7530 >> SHIFT );
}
*/
return *g_systemBtnShadowColour; return *g_systemBtnShadowColour;
}
case wxSYS_COLOUR_3DHIGHLIGHT: case wxSYS_COLOUR_3DHIGHLIGHT:
//case wxSYS_COLOUR_BTNHIGHLIGHT: //case wxSYS_COLOUR_BTNHIGHLIGHT:
{
return * wxWHITE; return * wxWHITE;
/* I think this should normally be white (JACS 8/2000) /* I think this should normally be white (JACS 8/2000)
Hmm, I'm quite sure it shouldn't ... (VZ 20.08.01)
if (!g_systemBtnHighlightColour) if (!g_systemBtnHighlightColour)
{ {
g_systemBtnHighlightColour = g_systemBtnHighlightColour =
@@ -184,68 +188,49 @@ wxColour wxSystemSettings::GetSystemColour( int index )
} }
return *g_systemBtnHighlightColour; return *g_systemBtnHighlightColour;
*/ */
}
case wxSYS_COLOUR_HIGHLIGHT: case wxSYS_COLOUR_HIGHLIGHT:
{
if (!g_systemHighlightColour) if (!g_systemHighlightColour)
{ {
GtkWidget *widget = gtk_button_new(); int red, green, blue;
GtkStyle *def = gtk_rc_get_style( widget ); if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_SELECTED,
if (!def) red, green, blue) )
def = gtk_widget_get_default_style();
if (def)
{ {
int red = def->bg[GTK_STATE_SELECTED].red; red =
int green = def->bg[GTK_STATE_SELECTED].green; green = 0;
int blue = def->bg[GTK_STATE_SELECTED].blue; blue = 0x9c40;
g_systemHighlightColour = }
new wxColour( red >> SHIFT,
g_systemHighlightColour = new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
blue >> SHIFT ); blue >> SHIFT );
} }
else
{
g_systemHighlightColour =
new wxColour( 0 >> SHIFT,
0 >> SHIFT,
0x9c40 >> SHIFT );
}
gtk_widget_destroy( widget );
}
return *g_systemHighlightColour; return *g_systemHighlightColour;
}
case wxSYS_COLOUR_LISTBOX: case wxSYS_COLOUR_LISTBOX:
{
if (!g_systemListBoxColour) if (!g_systemListBoxColour)
{ {
GtkWidget *widget = gtk_list_new(); int red, green, blue;
GtkStyle *def = gtk_rc_get_style( widget ); if ( GetColourFromGTKWidget(GTK_LIST, GTK_STATE_NORMAL,
if (!def) red, green, blue) )
def = gtk_widget_get_default_style();
if (def)
{ {
int red = def->base[GTK_STATE_NORMAL].red; g_systemListBoxColour = new wxColour( red >> SHIFT,
int green = def->base[GTK_STATE_NORMAL].green;
int blue = def->base[GTK_STATE_NORMAL].blue;
g_systemListBoxColour =
new wxColour( red >> SHIFT,
green >> SHIFT, green >> SHIFT,
blue >> SHIFT ); blue >> SHIFT );
} }
else else
{
g_systemListBoxColour = new wxColour(*wxWHITE); g_systemListBoxColour = new wxColour(*wxWHITE);
gtk_widget_destroy( widget ); }
} }
return *g_systemListBoxColour; 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:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT: case wxSYS_COLOUR_INFOTEXT:
{
if (!g_systemBtnTextColour) if (!g_systemBtnTextColour)
{ {
GtkWidget *widget = gtk_button_new(); GtkWidget *widget = gtk_button_new();
@@ -270,9 +255,8 @@ wxColour wxSystemSettings::GetSystemColour( int index )
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
} }
return *g_systemBtnTextColour; return *g_systemBtnTextColour;
}
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
{
if (!g_systemHighlightTextColour) if (!g_systemHighlightTextColour)
{ {
wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
@@ -282,13 +266,12 @@ wxColour wxSystemSettings::GetSystemColour( int index )
g_systemHighlightTextColour = new wxColour(*wxWHITE); g_systemHighlightTextColour = new wxColour(*wxWHITE);
} }
return *g_systemHighlightTextColour; return *g_systemHighlightTextColour;
}
case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE: case wxSYS_COLOUR_APPWORKSPACE:
{
return *wxWHITE; // ? return *wxWHITE; // ?
} }
}
return *wxWHITE; return *wxWHITE;
} }