fixed array tests compilation and a bug in obj array test

[wxWidgets.git] / include / wx / generic / prntdlgg.h

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index da5f97f15c090a5b609a63a14508a2ec050253db..99d4d2a97402a29383487a0bd6eaa76bbe3eec2c 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -21,7 +21,6 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 
 #if wxUSE_PRINTING_ARCHITECTURE
 

-#include "wx/dialog.h"

 #include "wx/dialog.h"
 
 #if wxUSE_POSTSCRIPT
 #include "wx/dialog.h"
 
 #if wxUSE_POSTSCRIPT


@@ -31,7 +30,7 @@
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;

-class WXDLLEXPORT wxChoice;
+class WXDLLEXPORT wxComboBox;

 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
 class WXDLLEXPORT wxPrintSetupData;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
 class WXDLLEXPORT wxPrintSetupData;


@@ -140,14 +139,14 @@ public:
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     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;
 
 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;
 
 #if wxUSE_POSTSCRIPT
     wxPrintData         m_printData;


@@ -170,7 +169,7 @@ public:
 
     void OnPrinter(wxCommandEvent& event);
 
 
     void OnPrinter(wxCommandEvent& event);
 

-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);

     wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:
     wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:


@@ -180,7 +179,7 @@ public:
     wxTextCtrl*     m_marginTopText;
     wxTextCtrl*     m_marginRightText;
     wxTextCtrl*     m_marginBottomText;
     wxTextCtrl*     m_marginTopText;
     wxTextCtrl*     m_marginRightText;
     wxTextCtrl*     m_marginBottomText;

-    wxChoice*       m_paperTypeChoice;
+    wxComboBox*       m_paperTypeChoice;

 
     static bool     m_pageSetupDialogCancelled;
 
 
     static bool     m_pageSetupDialogCancelled;