set string length to 0 in AllocBeforeWrite() just to be tidy (replaces patch 1123226)

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 9e9729670098a5ee77ff37eac0a33356683baae3..f2fe6fdc373007c856e120fb9c0b459b3eb057b7 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univframe.h"
 #endif
 
     #pragma implementation "univframe.h"
 #endif
 


@@ -96,19 +96,21 @@ void wxFrame::PositionMenuBar()
         // the menubar is positioned above the client size, hence the negative
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
         // the menubar is positioned above the client size, hence the negative
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;

-        
+

         wxCoord heightTbar = 0;
         wxCoord heightTbar = 0;

-        // In between sits the toolbar
-        if (m_frameToolBar)
+
+#if wxUSE_TOOLBAR
+        if ( m_frameToolBar )

             heightTbar = m_frameToolBar->GetSize().y;
             heightTbar = m_frameToolBar->GetSize().y;

+#endif // wxUSE_TOOLBAR

 
 

-        m_frameMenuBar->SetSize(0, 
-#ifdef __WXPM__         // FIXME -- remove this, make wxOS2/Univ behave as
+        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 - heightTbar,
-#endif                         
+                                - (heightMbar + heightTbar),
+#endif

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


@@ -134,7 +136,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);

     }
 }
 
     }
 }
 


@@ -196,8 +198,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     }
 #endif // wxUSE_MENUS
 
     }
 #endif // wxUSE_MENUS
 

-   // This is done in wxFrameBase already
-#if 0 // wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR

     if ( m_frameToolBar )
     {
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
     if ( m_frameToolBar )
     {
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )


@@ -258,7 +259,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;


@@ -306,7 +309,7 @@ int wxFrame::GetMinHeight() const
         height += m_frameStatusBar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR
         height += m_frameStatusBar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR

-    
+

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


@@ -316,10 +319,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;

 }
 }