Make easier to compile with MSVC5.

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 951ab8630a62ca1594a385c9836481b3d81426b6..5beac716265b1a0bc54226274c75b24314600c5d 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -37,32 +37,29 @@
 // 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()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

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

-wxFrame::wxFrame()
-{
-}
-
-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)
+bool wxFrame::Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxString& name)

 {
     m_renderer = NULL;
 {
     m_renderer = NULL;

+    return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);

 }
 
 }
 

+

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


@@ -84,15 +81,17 @@ 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);

     }
 }
     }
 }

+

 #endif // wxUSE_MENUS
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
 #endif // wxUSE_MENUS
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 {

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

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


@@ -104,9 +103,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-bool wxFrame::Enable( bool enable )
+bool wxFrame::Enable(bool enable)

 {
 {

-    if (!wxFrameNative::Enable(enable))
+    if (!wxFrameBase::Enable(enable))

        return FALSE;
 #ifdef __WXMICROWIN__
     if (m_frameMenuBar)
        return FALSE;
 #ifdef __WXMICROWIN__
     if (m_frameMenuBar)