From 94129723b995cb7e48094f602f5ba52b346f6855 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 24 May 1999 11:37:01 +0000 Subject: [PATCH] Hardcode colours in systems settings. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/settings.cpp | 42 ++++++++-------------- src/gtk1/settings.cpp | 42 ++++++++-------------- utils/framelayout/samples/test/fl_test.cpp | 39 +------------------- 3 files changed, 31 insertions(+), 92 deletions(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 72b4c3e2a8..8ee443f68b 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -56,7 +56,7 @@ #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_systemBtnShadowColour = (wxColour *) NULL; wxColour *g_systemBtnHighlightColour = (wxColour *) NULL; @@ -66,7 +66,7 @@ wxFont *g_systemFont = (wxFont *) NULL; void wxSystemSettings::Done() { - delete g_systemWinColour; +// delete g_systemWinColour; delete g_systemBtnFaceColour; delete g_systemBtnShadowColour; delete g_systemBtnHighlightColour; @@ -88,62 +88,50 @@ wxColour wxSystemSettings::GetSystemColour( int index ) 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 ); + new wxColour( 0xd6d6 >> SHIFT, + 0xd6d6 >> SHIFT, + 0xd6d6 >> SHIFT ); } return *g_systemBtnFaceColour; } case wxSYS_COLOUR_WINDOW: { - GtkStyle *style = gtk_widget_get_default_style(); - if (!g_systemWinColour) - { - g_systemWinColour = - new wxColour( style->base[0].red >> SHIFT, - style->base[0].green >> SHIFT, - style->base[0].blue >> SHIFT ); - } - return *g_systemWinColour; + return *wxWHITE; } case wxSYS_COLOUR_GRAYTEXT: 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 ); + new wxColour( 0x7530 >> SHIFT, + 0x7530 >> SHIFT, + 0x7530 >> SHIFT ); } return *g_systemBtnShadowColour; } 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 ); + new wxColour( 0xea60 >> SHIFT, + 0xea60 >> SHIFT, + 0xea60 >> SHIFT ); } return *g_systemBtnHighlightColour; } case wxSYS_COLOUR_HIGHLIGHT: { - 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 ); + new wxColour( 0 >> SHIFT, + 0 >> SHIFT, + 0x9c40 >> SHIFT ); } return *g_systemHighlightColour; } diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index 72b4c3e2a8..8ee443f68b 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -56,7 +56,7 @@ #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_systemBtnShadowColour = (wxColour *) NULL; wxColour *g_systemBtnHighlightColour = (wxColour *) NULL; @@ -66,7 +66,7 @@ wxFont *g_systemFont = (wxFont *) NULL; void wxSystemSettings::Done() { - delete g_systemWinColour; +// delete g_systemWinColour; delete g_systemBtnFaceColour; delete g_systemBtnShadowColour; delete g_systemBtnHighlightColour; @@ -88,62 +88,50 @@ wxColour wxSystemSettings::GetSystemColour( int index ) 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 ); + new wxColour( 0xd6d6 >> SHIFT, + 0xd6d6 >> SHIFT, + 0xd6d6 >> SHIFT ); } return *g_systemBtnFaceColour; } case wxSYS_COLOUR_WINDOW: { - GtkStyle *style = gtk_widget_get_default_style(); - if (!g_systemWinColour) - { - g_systemWinColour = - new wxColour( style->base[0].red >> SHIFT, - style->base[0].green >> SHIFT, - style->base[0].blue >> SHIFT ); - } - return *g_systemWinColour; + return *wxWHITE; } case wxSYS_COLOUR_GRAYTEXT: 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 ); + new wxColour( 0x7530 >> SHIFT, + 0x7530 >> SHIFT, + 0x7530 >> SHIFT ); } return *g_systemBtnShadowColour; } 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 ); + new wxColour( 0xea60 >> SHIFT, + 0xea60 >> SHIFT, + 0xea60 >> SHIFT ); } return *g_systemBtnHighlightColour; } case wxSYS_COLOUR_HIGHLIGHT: { - 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 ); + new wxColour( 0 >> SHIFT, + 0 >> SHIFT, + 0x9c40 >> SHIFT ); } return *g_systemHighlightColour; } diff --git a/utils/framelayout/samples/test/fl_test.cpp b/utils/framelayout/samples/test/fl_test.cpp index 8e32d9677e..2ef179f116 100644 --- a/utils/framelayout/samples/test/fl_test.cpp +++ b/utils/framelayout/samples/test/fl_test.cpp @@ -127,13 +127,7 @@ MyFrame::MyFrame(wxFrame *frame) wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION, "freimas" ) { -#ifdef __WXMSW__ mpInternalFrm = (wxPanel*)this; -#else - mpInternalFrm = new wxPanel( this, -1 ); -#endif - - mpClientWnd = CreateTextCtrl( "Client window" ); @@ -210,38 +204,7 @@ MyFrame::MyFrame(wxFrame *frame) TRUE ); - mpLayout->AddBar( CreateTextCtrl("Fixed0"), // bar window - sizes1, wxTOP, // alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - "ToolBar1", // name to refere in customization pop-ups - TRUE - ); - - wxDynamicToolBar* pToolBar = new wxDynamicToolBar(); - - pToolBar->Create( mpInternalFrm, -1 ); - - // 1001-1006 ids of command events fired by added tool-buttons - - pToolBar->AddTool( 1001, "new.bmp" ); - pToolBar->AddTool( 1002, "open.bmp" ); - pToolBar->AddTool( 1003, "save.bmp" ); - - pToolBar->AddTool( 1004, "cut.bmp" ); - pToolBar->AddTool( 1005, "copy.bmp" ); - pToolBar->AddTool( 1006, "paste.bmp" ); - - - mpLayout->AddBar( pToolBar, // bar window (can be NULL) - sizes2, wxTOP, // alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - "ToolBar2", // name to refere in customization pop-ups - FALSE - ); - - mpLayout->EnableFloating( TRUE ); // off, thinking bout wxGtk... + mpLayout->EnableFloating( FALSE ); // off, thinking bout wxGtk... } MyFrame::~MyFrame() -- 2.45.2