check better before overwriting files (patch 951868)

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index f246bd9f7bfdff75de7bda20fe338685a07ccfa1..c61366cee5db07a94f596f211be0e46ab5e9b4a6 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -49,21 +49,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 // ctors
 // ----------------------------------------------------------------------------
 
-wxFrame::wxFrame()
-{
-}
-
-wxFrame::wxFrame(wxWindow *parent,
-                 wxWindowID id,
-                 const wxString& title,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 long style,
-                 const wxString& name)
-{
-    Create(parent, id, title, pos, size, style, name);
-}
-
 bool wxFrame::Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -274,7 +259,9 @@ void wxFrame::DoSetClientSize(int width, int height)
 #if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {
+#if wxUSE_STATUSBAR
         height += m_frameStatusBar->GetSize().y;
+#endif // wxUSE_STATUSBAR
 
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
             width += m_frameToolBar->GetSize().x;