Add missing WXK constants for the control keys

[wxWidgets.git] / src / osx / carbon / printdlg.cpp

diff --git a/src/osx/carbon/printdlg.cpp b/src/osx/carbon/printdlg.cpp
index a36ecd0367dbf23ad1b1361491bdacb2038ffebc..3f36361060f38cf6f1bac980e6511d950bc1ad0d 100644 (file)
--- a/src/osx/carbon/printdlg.cpp
+++ b/src/osx/carbon/printdlg.cpp
@@ -29,67 +29,20 @@
 #include "wx/osx/private.h"
 #include "wx/statline.h"
 
-
-// Use generic page setup dialog: use your own native one if one exists.
-
-IMPLEMENT_DYNAMIC_CLASS(wxMacPrintDialog, wxPrintDialogBase)
-
-
-wxMacPrintDialog::wxMacPrintDialog()
-{
-    m_dialogParent = NULL;
-    m_printerDC = NULL;
-    m_destroyDC = true;
-}
-
-wxMacPrintDialog::wxMacPrintDialog( wxWindow *p, wxPrintDialogData *data )
-{
-    Create( p, data );
-}
-
-wxMacPrintDialog::wxMacPrintDialog( wxWindow *p, wxPrintData *data )
-{
-    wxPrintDialogData data2;
-    if (data != NULL)
-        data2 = *data;
-
-    Create( p, &data2 );
-}
-
-bool wxMacPrintDialog::Create( wxWindow *p, wxPrintDialogData *data )
-{
-    m_dialogParent = p;
-    m_printerDC = NULL;
-    m_destroyDC = true;
-
-    if (data != NULL)
-        m_printDialogData = *data;
-
-    return true;
-}
-
-wxMacPrintDialog::~wxMacPrintDialog()
-{
-    if (m_destroyDC && m_printerDC)
-    {
-        delete m_printerDC;
-        m_printerDC = NULL;
-    }
-}
-
-#if wxOSX_USE_CARBON
 int wxMacPrintDialog::ShowModal()
 {
     m_printDialogData.GetPrintData().ConvertToNative();
     ((wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
     int result = wxID_CANCEL;
-    
+
     OSErr err = noErr;
     Boolean accepted;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData();
+    wxDialog::OSXBeginModalDialog();
     err = PMSessionPrintDialog(nativeData->GetPrintSession(), nativeData->GetPrintSettings(),
         nativeData->GetPageFormat(), &accepted );
+    wxDialog::OSXEndModalDialog();
 
     if ((err == noErr) && !accepted)
     {
@@ -118,41 +71,7 @@ int wxMacPrintDialog::ShowModal()
     }
     return result;
 }
-#endif
 
-wxDC *wxMacPrintDialog::GetPrintDC()
-{
-    return new wxPrinterDC( m_printDialogData.GetPrintData() );
-}
-
-IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase)
-
-wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupData *data )
-    : wxPageSetupDialogBase()
-{
-    Create( p, data );
-}
-
-bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupData *data )
-{
-    m_dialogParent = p;
-
-    if (data != NULL)
-        m_pageSetupData = (*data);
-
-    return true;
-}
-
-wxMacPageSetupDialog::~wxMacPageSetupDialog()
-{
-}
-
-wxPageSetupData& wxMacPageSetupDialog::GetPageSetupDialogData()
-{
-    return m_pageSetupData;
-}
-
-#if wxOSX_USE_CARBON
 int wxMacPageSetupDialog::ShowModal()
 {
     m_pageSetupData.GetPrintData().ConvertToNative();
@@ -163,8 +82,10 @@ int wxMacPageSetupDialog::ShowModal()
     OSErr err = noErr;
     Boolean accepted;
 
+    wxDialog::OSXBeginModalDialog();
     err = PMSessionPageSetupDialog( nativeData->GetPrintSession(), nativeData->GetPageFormat(),
         &accepted );
+    wxDialog::OSXEndModalDialog();
 
     if ((err == noErr) && !accepted)
     {
@@ -196,90 +117,5 @@ int wxMacPageSetupDialog::ShowModal()
     }
     return result;
 }
-#endif
-
-IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog)
-
-wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupData *data) :
-  wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))),
-  m_pageSetupDialogData(data)
-  {
-  GetMinMargins();
-  wxBoxSizer *colSizer = new wxBoxSizer(wxVERTICAL);
-  wxFlexGridSizer *gridSizer = new wxFlexGridSizer(4, 5, 5);
-  colSizer->Add(gridSizer, wxSizerFlags().Border(wxALL, 5));
-  gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Left (mm):")), wxSizerFlags().Right());
-  gridSizer->Add(m_LeftMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left());
-  gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Top (mm):")), wxSizerFlags().Right());
-  gridSizer->Add(m_TopMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left());
-  gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Right (mm):")), wxSizerFlags().Right());
-  gridSizer->Add(m_RightMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left());
-  gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Bottom (mm):")), wxSizerFlags().Right());
-  gridSizer->Add(m_BottomMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left());
-  colSizer->Add(new wxStaticLine(this), wxSizerFlags().Expand().Border(wxTOP|wxBOTTOM, 5));
-  colSizer->Add(CreateButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Expand().Border(wxALL, 5));
-  TransferToWindow();
-  SetSizerAndFit(colSizer);
-  Center(wxBOTH);
-  }
-
-bool wxMacPageMarginsDialog::TransferToWindow()
-  {
-  wxASSERT(m_pageSetupDialogData);
-  wxPoint topLeft = m_pageSetupDialogData->GetMarginTopLeft();
-  wxPoint bottomRight = m_pageSetupDialogData->GetMarginBottomRight();
-  wxPoint minTopLeft = m_pageSetupDialogData->GetMinMarginTopLeft();
-  wxPoint minBottomRight = m_pageSetupDialogData->GetMinMarginBottomRight();
-  m_LeftMargin->SetValue(wxString::Format(wxT("%d"), wxMax(topLeft.x, minTopLeft.x)));
-  m_LeftMargin->SetSelection(-1, -1);
-  m_TopMargin->SetValue(wxString::Format(wxT("%d"), wxMax(topLeft.y, minTopLeft.y)));
-  m_TopMargin->SetSelection(-1, -1);
-  m_RightMargin->SetValue(wxString::Format(wxT("%d"), wxMax(bottomRight.x, minBottomRight.x)));
-  m_RightMargin->SetSelection(-1, -1);
-  m_BottomMargin->SetValue(wxString::Format(wxT("%d"), wxMax(bottomRight.y, minBottomRight.y)));
-  m_BottomMargin->SetSelection(-1, -1);
-  m_LeftMargin->SetFocus();
-  return true;
-  }
-  
-bool wxMacPageMarginsDialog::TransferDataFromWindow()
-  {
-  wxPoint topLeft, bottomRight;
-  if (!CheckValue(m_LeftMargin, &topLeft.x, m_MinMarginTopLeft.x, wxT("left margin"))) return false;
-  if (!CheckValue(m_TopMargin, &topLeft.y, m_MinMarginTopLeft.y, wxT("top margin"))) return false;
-  if (!CheckValue(m_RightMargin, &bottomRight.x, m_MinMarginBottomRight.x, wxT("right margin"))) return false;
-  if (!CheckValue(m_BottomMargin, &bottomRight.y, m_MinMarginBottomRight.y, wxT("bottom margin"))) return false;
-  m_pageSetupDialogData->SetMarginTopLeft(topLeft);
-  m_pageSetupDialogData->SetMarginBottomRight(bottomRight);
-  return true;
-  }
-  
-bool wxMacPageMarginsDialog::CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name)
-  {
-  long lvalue;
-  if (!textCtrl->GetValue().ToLong(&lvalue))
-    {
-    wxMessageBox(wxString::Format(wxT("Sorry, \"%s\" is not a valid numerical value for the %s"), textCtrl->GetValue().c_str(), name.c_str()), wxT("Page Margin Error"));
-    return false;
-    }
-  if (lvalue < minValue)
-    {
-    wxMessageBox(wxString::Format(wxT("Sorry, \"%s\" is not a valid value for the %s, which must be >= %d"), textCtrl->GetValue().c_str(), name.c_str(), minValue), wxT("Page Margin Error"));
-    textCtrl->SetValue(wxString::Format(wxT("%d"), minValue));
-    textCtrl->SetSelection(-1, -1);
-    textCtrl->SetFocus();
-    return false;
-    }
-  *value = int(lvalue);
-  return true;
-  }
-
-void wxMacPageMarginsDialog::GetMinMargins()
-  {
-  m_MinMarginTopLeft = m_pageSetupDialogData->GetMinMarginTopLeft();
-  m_MinMarginBottomRight = m_pageSetupDialogData->GetMinMarginBottomRight();
-  }
-
-
 
 #endif