Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 6155c3f6070893d557a07ddbb13c4adb194118e9..7a31bd9ab58f363afa14a3aa6d63d4700156908e 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -93,8 +93,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 #endif
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
 #endif
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)

-    EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-

     EVT_SIZE(wxPanel::OnSize)
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
     EVT_SIZE(wxPanel::OnSize)
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)


@@ -127,6 +125,11 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
     // so that non-solid background renders correctly under GTK+:
     SetThemeEnabled(true);
 
     // so that non-solid background renders correctly under GTK+:
     SetThemeEnabled(true);
 

+#ifdef __WXWINCE__
+    // Required to get solid control backgrounds under WinCE
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
+

     return true;
 }
 
     return true;
 }
 


@@ -145,16 +148,6 @@ void wxPanel::InitDialog()
 // event handlers
 // ----------------------------------------------------------------------------
 
 // event handlers
 // ----------------------------------------------------------------------------
 

-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-
-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
-}
-

 void wxPanel::OnSize(wxSizeEvent& event)
 {
     if (GetAutoLayout())
 void wxPanel::OnSize(wxSizeEvent& event)
 {
     if (GetAutoLayout())