::GetWindowText() -> wxGetWindowText

[wxWidgets.git] / src / generic / prntdlgg.cpp

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 3602295dab0920b5fc367ace7b93141531a50701..7b83c709ae8fc43eef5428eed01dbe98cca821aa 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -113,6 +113,11 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
+                    : wxDialog(parent, -1, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxDIALOG_MODAL |
+                               wxTAB_TRAVERSAL)
 {
     if ( data )
         m_printDialogData = *data;
@@ -122,8 +127,8 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 void wxGenericPrintDialog::Init(wxWindow *parent)
 {
-    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
-                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
+  //    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
+  //                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
 
     (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) );
 
@@ -137,7 +142,8 @@ void wxGenericPrintDialog::Init(wxWindow *parent)
 
     m_fromText = (wxTextCtrl*)NULL;
     m_toText = (wxTextCtrl*)NULL;
-
+    m_rangeRadioBox = (wxRadioBox *)NULL;
+    
     if (m_printDialogData.GetFromPage() != 0)
     {
         m_rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
@@ -287,17 +293,21 @@ bool wxGenericPrintDialog::TransferDataToWindow()
              m_fromText->SetValue(buf);
              sprintf(buf, "%d", m_printDialogData.GetToPage());
              m_toText->SetValue(buf);
-             if (m_printDialogData.GetAllPages())
-                m_rangeRadioBox->SetSelection(0);
-             else
-                m_rangeRadioBox->SetSelection(1);
+             if(m_rangeRadioBox)
+                if (m_printDialogData.GetAllPages())
+                   m_rangeRadioBox->SetSelection(0);
+                else
+                   m_rangeRadioBox->SetSelection(1);
           }
           else
           {
              m_fromText->Enable(FALSE);
              m_toText->Enable(FALSE);
-             m_rangeRadioBox->SetSelection(0);
-             m_rangeRadioBox->wxRadioBox::Enable(1, FALSE);
+             if(m_rangeRadioBox)
+             {
+                m_rangeRadioBox->SetSelection(0);
+                m_rangeRadioBox->wxRadioBox::Enable(1, FALSE);
+             }
           }
        }
     }
@@ -318,10 +328,13 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
            if(m_fromText) m_printDialogData.SetFromPage(atoi(m_fromText->GetValue()));
            if(m_toText)   m_printDialogData.SetToPage(atoi(m_toText->GetValue()));
         }
-        if (m_rangeRadioBox->GetSelection() == 0)
-            m_printDialogData.SetAllPages(TRUE);
-        else
-            m_printDialogData.SetAllPages(FALSE);
+        if(m_rangeRadioBox)
+        {
+           if (m_rangeRadioBox->GetSelection() == 0)
+              m_printDialogData.SetAllPages(TRUE);
+           else
+              m_printDialogData.SetAllPages(FALSE);
+        }
     }
     else
     { // continuous printing