having menu classinfo at one place

[wxWidgets.git] / src / common / prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 5828c679774af967de37b8e311eb6acc00efac49..ff67a1f4a0ea9e6b82b0affddffc6c1978c4b7b5 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -32,6 +32,7 @@
     #include "wx/layout.h"
     #include "wx/choice.h"
     #include "wx/button.h"
+    #include "wx/bmpbuttn.h"
     #include "wx/settings.h"
     #include "wx/dcmemory.h"
     #include "wx/dcclient.h"
@@ -1400,8 +1401,6 @@ private:
 
 void wxPreviewControlBar::CreateButtons()
 {
-    SetSize(0, 0, 400, 40);
-
     SizerWithButtons sizer(this);
 
     // Print button group (a single button).
@@ -1614,7 +1613,7 @@ void wxPreviewFrame::CreateControlBar()
     if (m_printPreview->GetPrintoutForPrinting())
         buttons |= wxPREVIEW_PRINT;
 
-    m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0,0), wxSize(400, 40));
+    m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this);
     m_controlBar->CreateButtons();
 }
 
@@ -1660,8 +1659,8 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
     m_previewFailed = false;
     m_currentPage = 1;
     m_currentZoom = 70;
-    m_topMargin = 40;
-    m_leftMargin = 40;
+    m_topMargin =
+    m_leftMargin = 2*wxSizerFlags::GetDefaultBorder();
     m_pageWidth = 0;
     m_pageHeight = 0;
     m_printingPrepared = false;