made default background colour BTNFACE (so that panels don't have to erase their background explicitly); removed now unneeded SetBackgroundColour() in wxDialog which now has default bg colour and restored one in wxFrame which now has a non default one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -360,8 +360,8 @@ bool wxApp::RegisterWindowClasses()
|
|||||||
wndclass.hInstance = wxhInstance;
|
wndclass.hInstance = wxhInstance;
|
||||||
wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
|
wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
|
||||||
|
|
||||||
// Register the frame window class.
|
// register the class for all normal windows
|
||||||
wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
|
wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
|
||||||
wndclass.lpszClassName = wxCanvasClassName;
|
wndclass.lpszClassName = wxCanvasClassName;
|
||||||
wndclass.style = styleNormal;
|
wndclass.style = styleNormal;
|
||||||
|
|
||||||
|
@@ -184,8 +184,6 @@ bool wxDialog::Create(wxWindow *parent,
|
|||||||
if ( !m_hasFont )
|
if ( !m_hasFont )
|
||||||
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
|
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
|
||||||
|
|
||||||
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
|
|
||||||
|
|
||||||
#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
|
#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
|
||||||
SetLeftMenu(wxID_OK, _("OK"));
|
SetLeftMenu(wxID_OK, _("OK"));
|
||||||
#endif
|
#endif
|
||||||
|
@@ -192,6 +192,8 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
|
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
|
||||||
|
|
||||||
#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
|
#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
|
||||||
SetLeftMenu(wxID_EXIT, _("Done"));
|
SetLeftMenu(wxID_EXIT, _("Done"));
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user