Don't call StartingKey if the key was F2

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index c61366cee5db07a94f596f211be0e46ab5e9b4a6..7f179b0eeed275ea678e5735f7168db5c242ca2d 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -32,6 +32,7 @@
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/statusbr.h"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/statusbr.h"

+    #include "wx/settings.h"

     #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
     #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 


@@ -41,6 +42,7 @@
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SIZE(wxFrame::OnSize)
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SIZE(wxFrame::OnSize)

+    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)


@@ -57,9 +59,22 @@ bool wxFrame::Create(wxWindow *parent,
                 long style,
                 const wxString& name)
 {
                 long style,
                 const wxString& name)
 {

-    return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return false;
+
+    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+
+    return true;

 }
 
 }
 

+// Responds to colour changes, and passes event on to children.
+void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+    Refresh();
+
+    event.Skip();
+}

 
 // ----------------------------------------------------------------------------
 // menu support
 
 // ----------------------------------------------------------------------------
 // menu support


@@ -105,7 +120,7 @@ void wxFrame::PositionMenuBar()
 #endif // wxUSE_TOOLBAR
 
         m_frameMenuBar->SetSize(0,
 #endif // wxUSE_TOOLBAR
 
         m_frameMenuBar->SetSize(0,

-#ifdef __WXPM__         // FIXME -- remove this, make wxOS2/Univ behave as
+#ifdef __WXPM__   // FIXME -- remove this, make wxOS2/Univ behave as

                  //          the rest of the world!!!
                                 GetClientSize().y - heightMbar - heightTbar,
 #else
                  //          the rest of the world!!!
                                 GetClientSize().y - heightMbar - heightTbar,
 #else


@@ -136,7 +151,7 @@ void wxFrame::PositionStatusBar()
     if ( m_frameStatusBar )
     {
         wxSize size = GetClientSize();
     if ( m_frameStatusBar )
     {
         wxSize size = GetClientSize();

-        m_frameStatusBar->SetSize(0, size.y, size.x, -1);
+        m_frameStatusBar->SetSize(0, size.y, size.x, wxDefaultCoord);

     }
 }
 
     }
 }
 


@@ -319,10 +334,10 @@ int wxFrame::GetMinHeight() const
 bool wxFrame::Enable(bool enable)
 {
     if (!wxFrameBase::Enable(enable))
 bool wxFrame::Enable(bool enable)
 {
     if (!wxFrameBase::Enable(enable))

-       return FALSE;
+        return false;

 #ifdef __WXMICROWIN__
     if (m_frameMenuBar)
         m_frameMenuBar->Enable(enable);
 #endif
 #ifdef __WXMICROWIN__
     if (m_frameMenuBar)
         m_frameMenuBar->Enable(enable);
 #endif

-    return TRUE;
+    return true;

 }
 }