GTK+ 2.0 can't compile egg tray code

[wxWidgets.git] / src / generic / panelg.cpp

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 81e5700262bb6b6ee903e651d9ceb2e2699bb0ba..9fba59a9fcc12ac97744e219a04b0905e02d8058 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -79,7 +79,7 @@ wxEND_FLAGS( wxPanelStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxPanel)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxPanel)

-    wxPROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 // style wxTAB_TRAVERSAL
 wxEND_PROPERTIES_TABLE()
 
 // style wxTAB_TRAVERSAL
 wxEND_PROPERTIES_TABLE()
 


@@ -121,7 +121,15 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-    return wxWindow::Create(parent, id, pos, size, style, name);
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return false;
+
+#ifdef __WXMSW__
+    // panels don't have the same colour as normal windows under Windows
+    SetDefaultBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+#endif // __WXMSW__
+
+    return true;

 }
 
 wxPanel::~wxPanel()
 }
 
 wxPanel::~wxPanel()