Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 6ef915d9b1fd02ceab3bacaee6b25ec11abd7076..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,11 +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
     // wxStandardPaths object is normally the same for wxBase and wxGUI
     // except in the case of wxMac and wxCocoa

-#ifndef __WXPALMOS__

     virtual wxStandardPathsBase& GetStandardPaths();
     virtual wxStandardPathsBase& GetStandardPaths();

-#endif
+#endif // wxUSE_STDPATHS

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