applied (slightly modified) wxGLApp patch for MSW

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 4f47ab48eaa4ae41eaf9898a232cac3f215ca4f3..a23450cfe4ab923cd5bc458967a3e671dfe4ab5d 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CHOICEDLG
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"


@@ -127,7 +129,7 @@ wxString wxGetSingleChoice( const wxString& message,
     return res;
 }
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,
 // Overloaded for backward compatibility
 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,


@@ -184,7 +186,7 @@ int wxGetSingleChoiceIndex( const wxString& message,
     return res;
 }
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,
 // Overloaded for backward compatibility
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,


@@ -242,7 +244,7 @@ void *wxGetSingleChoiceData( const wxString& message,
     return res;
 }
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 void *wxGetSingleChoiceData( const wxString& message,
                              const wxString& caption,
 // Overloaded for backward compatibility
 void *wxGetSingleChoiceData( const wxString& message,
                              const wxString& caption,


@@ -382,7 +384,7 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
     Create(parent, message, caption, n, choices, clientData, style);
 }
 
     Create(parent, message, caption, n, choices, clientData, style);
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,


@@ -523,3 +525,5 @@ bool wxMultiChoiceDialog::TransferDataFromWindow()
 
     return TRUE;
 }
 
     return TRUE;
 }

+
+#endif // wxUSE_CHOICEDLG