Removed the SaveBG hack. The real incompatibility is that the MemoryDC

[wxWidgets.git] / include / wx / choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index a8743fbb274cc4b3a7dc801380cc21f807fc3a80..b6600e3592a3d8c2b1afecf8e6e0e3f68c48d7e3 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -16,10 +16,12 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "choicebase.h"
 #endif
 
     #pragma interface "choicebase.h"
 #endif
 

+#if wxUSE_CHOICE
+

 #include "wx/ctrlsub.h"     // the base class
 
 // ----------------------------------------------------------------------------
 #include "wx/ctrlsub.h"     // the base class
 
 // ----------------------------------------------------------------------------


@@ -35,10 +37,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
 class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:

+    wxChoiceBase() { }
+    virtual ~wxChoiceBase();
+

     // all generic methods are in wxControlWithItems
     // all generic methods are in wxControlWithItems

-#ifdef __WXMAC_X__
-    virtual ~wxChoiceBase() {}
-#endif

 
     // single selection logic
     virtual void SetSelection(int n) = 0;
 
     // single selection logic
     virtual void SetSelection(int n) = 0;


@@ -47,7 +49,7 @@ public:
     // don't override this
     virtual void Select(int n) { SetSelection(n); }
 
     // don't override this
     virtual void Select(int n) { SetSelection(n); }
 

-    // set/get the number of columns in the control (as they're not supporte on
+    // set/get the number of columns in the control (as they're not supported on

     // most platforms, they do nothing by default)
     virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
     virtual int GetColumns() const { return 1 ; }
     // most platforms, they do nothing by default)
     virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
     virtual int GetColumns() const { return 1 ; }


@@ -55,27 +57,31 @@ public:
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 

+private:
+    DECLARE_NO_COPY_CLASS(wxChoiceBase)

 };
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class definition
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class definition
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/choice.h"
+#elif defined(__WXMSW__)

     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/choice.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/choice.h"
     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/choice.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/choice.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/choice.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/choice.h"

 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"
 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/choice.h"

 #endif
 
 #endif
 

+#endif // wxUSE_CHOICE
+

 #endif
     // _WX_CHOICE_H_BASE_
 #endif
     // _WX_CHOICE_H_BASE_