Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index e9f9accdac8059e78374f2a5edf1b5eb2e6f0022..10e4d6b8dc6127def449538b3095893042c09585 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -54,6 +54,9 @@ class WXDLLIMPEXP_BASE wxStandardPathsBase;
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:

+    // needed since this class declares virtual members
+    virtual ~wxAppTraitsBase() { }
+

     // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 
     // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 


@@ -77,9 +80,11 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 

+#if wxUSE_STDPATHS

     // wxStandardPaths object is normally the same for wxBase and wxGUI
     // except in the case of wxMac and wxCocoa
     virtual wxStandardPathsBase& GetStandardPaths();
     // wxStandardPaths object is normally the same for wxBase and wxGUI
     // except in the case of wxMac and wxCocoa
     virtual wxStandardPathsBase& GetStandardPaths();

+#endif // wxUSE_STDPATHS

 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------


@@ -139,7 +144,7 @@ public:
 
 // NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
 //     Unix code (and otherwise __UNIX__ wouldn't be defined)
 
 // NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
 //     Unix code (and otherwise __UNIX__ wouldn't be defined)

-#if defined(__PALMOS__)
+#if defined(__WXPALMOS__)

     #include "wx/palmos/apptbase.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
     #include "wx/palmos/apptbase.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/apptbase.h"


@@ -224,7 +229,7 @@ public:
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 

-#if defined(__PALMOS__)
+#if defined(__WXPALMOS__)

     #include "wx/palmos/apptrait.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/apptrait.h"
     #include "wx/palmos/apptrait.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/apptrait.h"