Applied patch [ 1427626 ] Fix wxFileConfig so that it still works after DeleteAll()

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 7a31bd9ab58f363afa14a3aa6d63d4700156908e..99314edecfe45aca9859a4598bcd24e9a7625d68 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "panelg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -125,7 +121,7 @@ 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__
+#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))

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


@@ -153,7 +149,7 @@ void wxPanel::OnSize(wxSizeEvent& event)
     if (GetAutoLayout())
         Layout();
 #if wxUSE_CONSTRAINTS
     if (GetAutoLayout())
         Layout();
 #if wxUSE_CONSTRAINTS

-#if defined(__WXPM__)
+#if defined(__WXPM__) && 0

     else
     {
         // Need to properly move child windows under OS/2
     else
     {
         // Need to properly move child windows under OS/2