use fallback encoding in wxConvAuto when input is not in UTF-8

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

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 27f0cad8ba1f7ef8c7b57dd0456e7dd3fd2fb326..f31a7762c7378667b5fec2eb1db838f48e6cf1f6 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -26,6 +26,7 @@
     #include "wx/toplevel.h"
     #include "wx/button.h"
     #include "wx/sizer.h"
     #include "wx/toplevel.h"
     #include "wx/button.h"
     #include "wx/sizer.h"

+    #include "wx/panel.h"

 #endif // !WX_PRECOMP
 
 #include "wx/statline.h"
 #endif // !WX_PRECOMP
 
 #include "wx/statline.h"


@@ -85,7 +86,9 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif
 
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif
 

-#ifdef __WXWINCE__
+    // FIXME: at least under wxCE and wxGTK1 the background is black if we don't do
+    //        this, no idea why...
+#if defined(__WXWINCE__) || (defined(__WXGTK__) && !defined(__WXGTK20__))

     SetBackgroundColour(parent->GetBackgroundColour());
 #endif
 
     SetBackgroundColour(parent->GetBackgroundColour());
 #endif