mac paths updated

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 2e3f502320d19cd597e9a3927d1bfeefe4b5d3b9..c869dd68a173e8207c80216a94584686b0a71a11 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
 
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 

+#include "wx/generic/prntdlgg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"


@@ -46,8 +48,6 @@
     #include "wx/statline.h"
 #endif
 
     #include "wx/statline.h"
 #endif
 

-#include "wx/generic/prntdlgg.h"
-

 #if wxUSE_POSTSCRIPT
     #include "wx/generic/dcpsg.h"
 #endif
 #if wxUSE_POSTSCRIPT
     #include "wx/generic/dcpsg.h"
 #endif


@@ -62,11 +62,20 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#ifndef __WXUNIVERSAL__
+

 #if wxUSE_LIBGNOMEPRINT
 #if wxUSE_LIBGNOMEPRINT

-#include "wx/html/forcelnk.h"
-FORCE_LINK(gnome_print)
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gnome_print)

 #endif
 
 #endif
 

+#if wxUSE_GTKPRINT
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gtk_print)
+#endif
+
+#endif // !wxUniv
+

 // ----------------------------------------------------------------------------
 // global vars
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global vars
 // ----------------------------------------------------------------------------


@@ -136,7 +145,8 @@ END_EVENT_TABLE()
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)

-                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
+                    : wxPrintDialogBase(GetParentForModalDialog(parent), 
+                               wxID_ANY, _("Print"),

                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)


@@ -149,7 +159,8 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)

-                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
+                    : wxPrintDialogBase(GetParentForModalDialog(parent), 
+                                wxID_ANY, _("Print"),

                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)


@@ -197,9 +208,9 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     if (factory->HasStatusLine())
     {
         flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),
     if (factory->HasStatusLine())
     {
         flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),

-            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+            0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );

         flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),
         flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),

-            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+            0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );

     }
 
     mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );
     }
 
     mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );


@@ -350,10 +361,12 @@ bool wxGenericPrintDialog::TransferDataToWindow()
              if (m_printDialogData.GetToPage() > 0)
                 m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
              if(m_rangeRadioBox)
              if (m_printDialogData.GetToPage() > 0)
                 m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
              if(m_rangeRadioBox)

+             {

                 if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
                    m_rangeRadioBox->SetSelection(0);
                 else
                    m_rangeRadioBox->SetSelection(1);
                 if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
                    m_rangeRadioBox->SetSelection(0);
                 else
                    m_rangeRadioBox->SetSelection(1);

+             }

           }
           else
           {
           }
           else
           {


@@ -705,9 +718,9 @@ bool wxGenericPrintSetupDialog::TransferDataToWindow()
     wxPostScriptPrintNativeData *data =
         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
 
     wxPostScriptPrintNativeData *data =
         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
 

-    if (m_printerCommandText && data->GetPrinterCommand())
+    if (m_printerCommandText && !data->GetPrinterCommand().empty())

         m_printerCommandText->SetValue(data->GetPrinterCommand());
         m_printerCommandText->SetValue(data->GetPrinterCommand());

-    if (m_printerOptionsText && data->GetPrinterOptions())
+    if (m_printerOptionsText && !data->GetPrinterOptions().empty())

         m_printerOptionsText->SetValue(data->GetPrinterOptions());
     if (m_colourCheckBox)
         m_colourCheckBox->SetValue(m_printData.GetColour());
         m_printerOptionsText->SetValue(data->GetPrinterOptions());
     if (m_colourCheckBox)
         m_colourCheckBox->SetValue(m_printData.GetColour());