Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 54458cd201d75856631606eee6e154dadb419e68..48733bdd22f403fe92b89fcc24ab3b2f462dc3a6 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -145,7 +145,7 @@ END_EVENT_TABLE()
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)

-                    : wxPrintDialogBase(GetParentForModalDialog(parent), 
+                    : wxPrintDialogBase(GetParentForModalDialog(parent, 0),

                                wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |


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

-                    : wxPrintDialogBase(GetParentForModalDialog(parent), 
+                    : wxPrintDialogBase(GetParentForModalDialog(parent, 0),

                                 wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                 wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |


@@ -458,13 +458,13 @@ wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxD
 }
 
 /* XPM */
 }
 
 /* XPM */

-static const char * check_xpm[] = {
+static const char* const check_xpm[] = {

 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */
 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */

-"      s None  c None",
-"X     c #000000",
-".     c #808080",
+"  s None c None",
+"X c #000000",
+". c #808080",

 /* pixels */
 "                ",
 "                ",
 /* pixels */
 "                ",
 "                ",


@@ -804,7 +804,7 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice()
 
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,
 
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,

-                                         _("Paper Size"),
+                                         _("Paper size"),

                                          wxDefaultPosition,
                                          wxSize(width, wxDefaultCoord),
                                          n, choices );
                                          wxDefaultPosition,
                                          wxSize(width, wxDefaultCoord),
                                          n, choices );


@@ -831,7 +831,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
                                                     wxPageSetupDialogData* data)
     : wxPageSetupDialogBase( parent,
                 wxID_ANY,
                                                     wxPageSetupDialogData* data)
     : wxPageSetupDialogBase( parent,
                 wxID_ANY,

-                _("Page Setup"),
+                _("Page setup"),

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


@@ -858,7 +858,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
 
     m_paperTypeChoice = new wxComboBox( this,
                                         wxPRINTID_PAPERSIZE,
 
     m_paperTypeChoice = new wxComboBox( this,
                                         wxPRINTID_PAPERSIZE,

-                                        _("Paper Size"),
+                                        _("Paper size"),

                                         wxDefaultPosition,
                                         wxSize(300, wxDefaultCoord),
                                         n, choices );
                                         wxDefaultPosition,
                                         wxSize(300, wxDefaultCoord),
                                         n, choices );


@@ -1060,7 +1060,7 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,
 
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,

-                                         _("Paper Size"),
+                                         _("Paper size"),

                                          wxPoint(*x, *y),
                                          wxSize(300, wxDefaultCoord),
                                          n, choices );
                                          wxPoint(*x, *y),
                                          wxSize(300, wxDefaultCoord),
                                          n, choices );