From 1f5c66294a280b8408a4e1464f6468bb97d141b2 Mon Sep 17 00:00:00 2001
From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Fri, 21 Mar 2008 14:21:52 +0000
Subject: [PATCH] add to GetToolkitVersion() the = NULL default values for the
 two arguments: they were documented but not actually implemented

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/apptrait.h        | 4 ++--
 include/wx/msdos/apptrait.h  | 2 +-
 include/wx/msw/apptrait.h    | 2 +-
 include/wx/os2/apptrait.h    | 2 +-
 include/wx/palmos/apptrait.h | 2 +-
 include/wx/unix/apptrait.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 73110bbcc1..dc1d1785f9 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -141,7 +141,7 @@ public:
     // runtime (not compile-time) version.
     // returns wxPORT_BASE for console applications and one of the remaining
     // wxPORT_* values for GUI applications.
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const = 0;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const = 0;
 
     // return true if the port is using wxUniversal for the GUI, false if not
     virtual bool IsUsingUniversalWidgets() const = 0;
@@ -226,7 +226,7 @@ public:
     virtual void RemoveFromPendingDelete(wxObject *object);
 
     // the GetToolkitVersion for console application is always the same
-    virtual wxPortId GetToolkitVersion(int *verMaj, int *verMin) const
+    virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const
     {
         // no toolkits (wxBase is for console applications without GUI support)
         // NB: zero means "no toolkit", -1 means "not initialized yet"
diff --git a/include/wx/msdos/apptrait.h b/include/wx/msdos/apptrait.h
index 6b377ff7a1..b4520eaaea 100644
--- a/include/wx/msdos/apptrait.h
+++ b/include/wx/msdos/apptrait.h
@@ -24,7 +24,7 @@ class wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
     virtual wxEventLoopBase *CreateEventLoop();
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h
index 40cf996c8d..aca686e5fa 100644
--- a/include/wx/msw/apptrait.h
+++ b/include/wx/msw/apptrait.h
@@ -43,7 +43,7 @@ public:
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
     virtual bool DoMessageFromThreadWait();
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
     virtual WXDWORD WaitForThread(WXHANDLE hThread);
 };
 
diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index 34b5e30233..cfd7acce88 100644
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -34,7 +34,7 @@ public:
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
     // wxThread helpers
     // ----------------
diff --git a/include/wx/palmos/apptrait.h b/include/wx/palmos/apptrait.h
index b6238ebd67..f8eef8d389 100644
--- a/include/wx/palmos/apptrait.h
+++ b/include/wx/palmos/apptrait.h
@@ -50,7 +50,7 @@ public:
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
     virtual bool DoMessageFromThreadWait();
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 };
 
 #endif // wxUSE_GUI
diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 3c172d803b..ab34f3ada9 100644
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -46,7 +46,7 @@ public:
 #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
 #if defined(__WXGTK__) && wxUSE_INTL
     virtual void SetLocale();
-- 
2.45.2