fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index fdd0927bf699d5f5cc0f56691a2cc07ff6332b9e..798ac4558d33dc82b76d19a558e3637af46e6006 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -37,35 +37,27 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-BEGIN_EVENT_TABLE(wxFrame, wxFrameNative)
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)

     EVT_SIZE(wxFrame::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxFrame::OnSize)
 END_EVENT_TABLE()
 

-#if defined(__WXMSW__)
-    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
-#elif defined(__WXGTK__)
-    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 
 // ----------------------------------------------------------------------------
 // ctors
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // ctors
 // ----------------------------------------------------------------------------
 

-wxFrame::wxFrame()
+bool wxFrame::Create(wxWindow *parent,
+                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);

 }
 
 }
 

-wxFrame::wxFrame(wxWindow *parent,
-                 wxWindowID id,
-                 const wxString& title,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 long style,
-                 const wxString& name)
-       : wxFrameNative(parent, id, title, pos, size, style, name)
-{
-    m_renderer = NULL;
-}

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


@@ -75,7 +67,7 @@ void wxFrame::OnSize(wxSizeEvent& event)
 {
 #if wxUSE_MENUS
     PositionMenuBar();
 {
 #if wxUSE_MENUS
     PositionMenuBar();

-#endif // wxUSE_WAVE
+#endif // wxUSE_MENUS

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -88,8 +80,9 @@ void wxFrame::PositionMenuBar()
     {
         // the menubar is positioned above the client size, hence the negative
         // y coord
     {
         // the menubar is positioned above the client size, hence the negative
         // y coord

-        m_frameMenuBar->SetSize(0, -m_frameMenuBar->GetSize().y,
-                                GetClientSize().x, -1);
+        wxCoord heightMbar = m_frameMenuBar->GetSize().y;
+        m_frameMenuBar->SetSize(0, -heightMbar,
+                                GetClientSize().x, heightMbar);

     }
 }
 
     }
 }
 


@@ -97,7 +90,7 @@ void wxFrame::PositionMenuBar()
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 {

-    wxPoint pt = wxFrameNative::GetClientAreaOrigin();
+    wxPoint pt = wxFrameBase::GetClientAreaOrigin();

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


@@ -109,3 +102,35 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

+void wxFrame::DoGetClientSize(int *width, int *height) const
+{
+    wxFrameBase::DoGetClientSize(width, height);
+#if wxUSE_MENUS
+    if ( m_frameMenuBar && height )
+    {
+        (*height) -= m_frameMenuBar->GetSize().y;
+    }
+#endif // wxUSE_MENUS
+}
+
+void wxFrame::DoSetClientSize(int width, int height)
+{
+#if wxUSE_MENUS
+    if ( m_frameMenuBar )
+    {
+        height += m_frameMenuBar->GetSize().y;
+    }
+#endif // wxUSE_MENUS
+    wxFrameBase::DoSetClientSize(width, height);
+}
+
+bool wxFrame::Enable(bool enable)
+{
+    if (!wxFrameBase::Enable(enable))
+       return FALSE;
+#ifdef __WXMICROWIN__
+    if (m_frameMenuBar)
+        m_frameMenuBar->Enable(enable);
+#endif
+    return TRUE;
+}