Document wxKill(wxSIGTERM) reliance on having an open window in wxMSW.

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

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 7e146d6291937b72ebc61ab244af6a3360cc9b52..55c0b785f8da46579b0d26b9f2fbeb1ea4f1ecfe 100644 (file)
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -142,9 +142,6 @@ public:
     virtual wxString GetTempDir() const;
 
 
     virtual wxString GetTempDir() const;
 
 

-    // ctor for the base class
-    wxStandardPathsBase();
-

     // virtual dtor for the base class
     virtual ~wxStandardPathsBase();
 
     // virtual dtor for the base class
     virtual ~wxStandardPathsBase();
 


@@ -158,6 +155,10 @@ public:
 
 
 protected:
 
 
 protected:

+    // Ctor is protected as this is a base class which should never be created
+    // directly.
+    wxStandardPathsBase();
+

     // append the path component, with a leading path separator if a
     // path separator or dot (.) is not already at the end of dir
     static wxString AppendPathComponent(const wxString& dir, const wxString& component);
     // append the path component, with a leading path separator if a
     // path separator or dot (.) is not already at the end of dir
     static wxString AppendPathComponent(const wxString& dir, const wxString& component);


@@ -171,7 +172,7 @@ protected:
 };
 
 #if wxUSE_STDPATHS
 };
 
 #if wxUSE_STDPATHS

-    #if defined(__WXMSW__)
+    #if defined(__WINDOWS__)

         #include "wx/msw/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
         #include "wx/msw/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)


@@ -210,6 +211,12 @@ public:
     virtual wxString GetPluginsDir() const { return m_prefix; }
     virtual wxString GetDocumentsDir() const { return m_prefix; }
 
     virtual wxString GetPluginsDir() const { return m_prefix; }
     virtual wxString GetDocumentsDir() const { return m_prefix; }
 

+protected:
+    // Ctor is protected because wxStandardPaths::Get() should always be used
+    // to access the global wxStandardPaths object of the correct type instead
+    // of creating one of a possibly wrong type yourself.
+    wxStandardPaths() { }
+

 private:
     wxString m_prefix;
 };
 private:
     wxString m_prefix;
 };