Added DnD guard

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index ae8f7cf2215844541a742efe64c9d444b716f7b6..91c5a9d7eb1b04b4b7d8c2c9ca7a665bfe56bd1b 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        univ/frame.cpp
+// Name:        src/univ/frame.cpp

 // Purpose:     wxFrame class for wxUniversal
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxFrame class for wxUniversal
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univframe.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"
 


@@ -28,10 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-    #include "wx/menu.h"
+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/frame.h"
+    #include "wx/menu.h"

     #include "wx/statusbr.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 +39,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)


@@ -50,16 +49,29 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 // ----------------------------------------------------------------------------
 
 bool wxFrame::Create(wxWindow *parent,
 // ----------------------------------------------------------------------------
 
 bool wxFrame::Create(wxWindow *parent,

-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style,
-                const wxString& name)
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos,
+                     const wxSize& size,
+                     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


@@ -97,13 +109,20 @@ void wxFrame::PositionMenuBar()
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
 
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
 

-        m_frameMenuBar->SetSize(0, 
-#ifdef __WXPM__         // FIXME -- remove this, make wxOS2/Univ behave as
+        wxCoord heightTbar = 0;
+
+#if wxUSE_TOOLBAR
+        if ( m_frameToolBar )
+            heightTbar = m_frameToolBar->GetSize().y;
+#endif // wxUSE_TOOLBAR
+
+        m_frameMenuBar->SetSize(0,
+#ifdef __WXPM__   // FIXME -- remove this, make wxOS2/Univ behave as

                  //          the rest of the world!!!
                  //          the rest of the world!!!

-                                GetClientSize().y - heightMbar,
+                                GetClientSize().y - heightMbar - heightTbar,

 #else
 #else

-                                -heightMbar,
-#endif                         
+                                - (heightMbar + heightTbar),
+#endif

                                 GetClientSize().x, heightMbar);
     }
 }
                                 GetClientSize().x, heightMbar);
     }
 }


@@ -129,7 +148,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);

     }
 }
 
     }
 }
 


@@ -252,7 +271,9 @@ void wxFrame::DoSetClientSize(int width, int height)
 #if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {
 #if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {

+#if wxUSE_STATUSBAR

         height += m_frameStatusBar->GetSize().y;
         height += m_frameStatusBar->GetSize().y;

+#endif // wxUSE_STATUSBAR

 
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
             width += m_frameToolBar->GetSize().x;
 
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
             width += m_frameToolBar->GetSize().x;


@@ -264,56 +285,44 @@ void wxFrame::DoSetClientSize(int width, int height)
     wxFrameBase::DoSetClientSize(width, height);
 }
 
     wxFrameBase::DoSetClientSize(width, height);
 }
 

-int wxFrame::GetMinWidth() const
-{
-#if wxUSE_MENUS
-    if ( m_frameMenuBar )
-    {
-        return wxMax(m_frameMenuBar->GetBestSize().x, wxFrameBase::GetMinWidth());
-    }
-    else
-#endif // wxUSE_MENUS
-        return wxFrameBase::GetMinWidth();
-}
-
-int wxFrame::GetMinHeight() const
+wxSize wxFrame::GetMinSize() const

 {
 {

-    int height = 0;
+    wxSize size = wxFrameBase::GetMinSize();

 
 #if wxUSE_MENUS
     if ( m_frameMenuBar )
     {
 
 #if wxUSE_MENUS
     if ( m_frameMenuBar )
     {

-        height += m_frameMenuBar->GetSize().y;
+        const wxSize sizeMenu = m_frameMenuBar->GetBestSize();
+        if ( sizeMenu.x > size.x )
+            size.x = sizeMenu.x;
+        size.y += sizeMenu.y;

     }
 #endif // wxUSE_MENUS
 
 #if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {
     }
 #endif // wxUSE_MENUS
 
 #if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {

-        height += m_frameToolBar->GetSize().y;
+        size.y += m_frameToolBar->GetSize().y;

     }
 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_STATUSBAR
     if ( m_frameStatusBar )
     {
     }
 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_STATUSBAR
     if ( m_frameStatusBar )
     {

-        height += m_frameStatusBar->GetSize().y;
+        size.y += m_frameStatusBar->GetSize().y;

     }
 #endif // wxUSE_STATUSBAR
     }
 #endif // wxUSE_STATUSBAR

-    
-    if ( height )
-        return height + wxMax(0, wxFrameBase::GetMinHeight());
-    else
-        return wxFrameBase::GetMinHeight();
+
+    return size;

 }
 
 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;

 }
 }