1. added wfstream.cpp to wxBase (needed by filesys.cpp)

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 52d864fbf566aee3899f921b00b3ee4912eaf4ed..a6521927222eea87890260052360ab19e6f5193c 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -29,7 +29,6 @@
 
 #include "wx/generic/panelg.h"
 
 
 #include "wx/generic/panelg.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)


@@ -39,7 +38,6 @@ BEGIN_EVENT_TABLE(wxPanel, wxWindow)
   EVT_SIZE(wxPanel::OnSize)
 END_EVENT_TABLE()
 
   EVT_SIZE(wxPanel::OnSize)
 END_EVENT_TABLE()
 

-#endif

 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {


@@ -57,10 +55,8 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 
     if ( ret )
     {
 
     if ( ret )
     {

-#ifndef __WXGTK__

         SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
         SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
         SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
         SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));

-#endif

     }
 
     return ret;
     }
 
     return ret;


@@ -190,7 +186,7 @@ void wxPanel::OnSize(wxSizeEvent& WXUNUSED(event))
 void wxPanel::SetFocus()
 {
     // If the panel gets the focus *by way of getting it set directly*
 void wxPanel::SetFocus()
 {
     // If the panel gets the focus *by way of getting it set directly*

-    // we move it to the first window that can get it.
+    // we move the focus to the first window that can get it.

 
     wxNode *node = GetChildren().First();
     while (node)
 
     wxNode *node = GetChildren().First();
     while (node)


@@ -213,13 +209,15 @@ void wxPanel::SetFocus()
 void wxPanel::OnFocus(wxFocusEvent& event)
 {
     // If the panel gets the focus *by way of getting clicked on*
 void wxPanel::OnFocus(wxFocusEvent& event)
 {
     // If the panel gets the focus *by way of getting clicked on*

-    // we move it to either the last window that had the focus or
-    // the first one that can get it.
+    // we move the focus to either the last window that had the 
+    // focus or the first one that can get it.

 
     if (m_winLastFocused)
     {
 
     if (m_winLastFocused)
     {

-        // it might happen that the window got reparented...
-        if ( m_winLastFocused->GetParent() == this )
+        // It might happen that the window got reparented or no longer 
+       // accepts the focus.
+        if ((m_winLastFocused->GetParent() == this) &&
+           (m_winLastFocused->AcceptsFocus()))

         {
             m_winLastFocused->SetFocus();
             return;
         {
             m_winLastFocused->SetFocus();
             return;