diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index da5f97f15c..097ea5403f 100644
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -31,7 +31,7 @@
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;
-class WXDLLEXPORT wxChoice;
+class WXDLLEXPORT wxComboBox;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
 class WXDLLEXPORT wxPrintSetupData;
@@ -140,14 +140,14 @@ public:
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);
 
 public:
     wxRadioBox*         m_orientationRadioBox;
     wxTextCtrl*         m_printerCommandText;
     wxTextCtrl*         m_printerOptionsText;
     wxCheckBox*         m_colourCheckBox;
-    wxChoice*           m_paperTypeChoice;
+    wxComboBox*           m_paperTypeChoice;
 
 #if wxUSE_POSTSCRIPT
     wxPrintData         m_printData;
@@ -170,7 +170,7 @@ public:
 
     void OnPrinter(wxCommandEvent& event);
 
-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);
     wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:
@@ -180,7 +180,7 @@ public:
     wxTextCtrl*     m_marginTopText;
     wxTextCtrl*     m_marginRightText;
     wxTextCtrl*     m_marginBottomText;
-    wxChoice*       m_paperTypeChoice;
+    wxComboBox*       m_paperTypeChoice;
 
     static bool     m_pageSetupDialogCancelled;
 
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 665c7ce812..b716064026 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -45,6 +45,7 @@
     #include "wx/radiobox.h"
     #include "wx/filedlg.h"
     #include "wx/choice.h"
+    #include "wx/combobox.h"
     #include <wx/intl.h>
 #endif
 
@@ -497,7 +498,7 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
     return TRUE;
 }
 
-wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 {
 /* Should not be necessary
     if (!wxThePrintPaperDatabase)
@@ -520,7 +521,9 @@ wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 
     int width = 250;
 
-    wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(width, -1), n,
+    wxComboBox *choice = new wxComboBox(this, wxPRINTID_PAPERSIZE,
+                                        _("Paper Size"),
+                                        wxPoint(*x, *y), wxSize(width, -1), n,
         choices);
 
     //    SetFont(thisFont);
@@ -741,7 +744,7 @@ bool wxGenericPageSetupDialog::TransferDataFromWindow()
     return TRUE;
 }
 
-wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 {
 /*
     if (!wxThePrintPaperDatabase)
@@ -763,7 +766,9 @@ wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(*x, *y));
     *y += 25;
 
-    wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(300, -1), n,
+    wxComboBox *choice = new wxComboBox(this, wxPRINTID_PAPERSIZE,
+                                        _("Paper Size"),
+                                        wxPoint(*x, *y), wxSize(300, -1), n,
         choices);
     *y += 35;
     delete[] choices;