Smooth Aqua buttons in wxTreeCtrl.

[wxWidgets.git] / src / univ / winuniv.cpp

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 2727e0b89a16c2ff3270975df19b2cfb68211ff8..dbb420c484c78fcf24e4b33ff5d96105654a78fd 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -135,11 +135,6 @@ bool wxWindow::Create(wxWindow *parent,
         PositionScrollbars();
     }
 
         PositionScrollbars();
     }
 

-    // the colours/fonts are default
-    m_hasBgCol =
-    m_hasFgCol =
-    m_hasFont = FALSE;
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -371,7 +366,7 @@ bool wxWindow::Enable(bool enable)
         return FALSE;
 
     // disabled window can't keep focus
         return FALSE;
 
     // disabled window can't keep focus

-    if ( FindFocus() == this )
+    if ( FindFocus() == this && GetParent() != NULL )

     {
         GetParent()->SetFocus();
     }
     {
         GetParent()->SetFocus();
     }