fix for wxComboBox::GetSelection from inside event handler

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 53fa919d262ed565b6187e8dfaaca20594ac2d11..28d12521593b7ac6950e3c2c2d0d4813fe25ea51 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -28,8 +28,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP


@@ -46,7 +44,7 @@
     #include "wx/filedlg.h"
     #include "wx/choice.h"
     #include "wx/combobox.h"
     #include "wx/filedlg.h"
     #include "wx/choice.h"
     #include "wx/combobox.h"

-    #include <wx/intl.h>
+    #include "wx/intl.h"

     #include "wx/sizer.h"
 #endif
 
     #include "wx/sizer.h"
 #endif
 


@@ -73,7 +71,6 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_POSTSCRIPT
 


@@ -92,7 +89,6 @@
     BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
         EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
     END_EVENT_TABLE()
     BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
         EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
     END_EVENT_TABLE()

-#endif // USE_SHARED_LIBRARY

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


@@ -274,7 +270,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         wxString f = wxFileSelector(_("PostScript file"),
             wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
             wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),
         wxString f = wxFileSelector(_("PostScript file"),
             wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
             wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),

-            _T("ps"), _T("*.ps"), 0, this);
+            wxT("ps"), wxT("*.ps"), 0, this);

         if ( f.IsEmpty() )
             return;
 
         if ( f.IsEmpty() )
             return;