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
This commit is contained in:
Francesco Montorsi
2008-03-21 14:21:52 +00:00
parent 27d335cc23
commit 1f5c66294a
6 changed files with 7 additions and 7 deletions

View File

@@ -141,7 +141,7 @@ public:
// runtime (not compile-time) version. // runtime (not compile-time) version.
// returns wxPORT_BASE for console applications and one of the remaining // returns wxPORT_BASE for console applications and one of the remaining
// wxPORT_* values for GUI applications. // 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 // return true if the port is using wxUniversal for the GUI, false if not
virtual bool IsUsingUniversalWidgets() const = 0; virtual bool IsUsingUniversalWidgets() const = 0;
@@ -226,7 +226,7 @@ public:
virtual void RemoveFromPendingDelete(wxObject *object); virtual void RemoveFromPendingDelete(wxObject *object);
// the GetToolkitVersion for console application is always the same // 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) // no toolkits (wxBase is for console applications without GUI support)
// NB: zero means "no toolkit", -1 means "not initialized yet" // NB: zero means "no toolkit", -1 means "not initialized yet"

View File

@@ -24,7 +24,7 @@ class wxGUIAppTraits : public wxGUIAppTraitsBase
{ {
public: public:
virtual wxEventLoopBase *CreateEventLoop(); virtual wxEventLoopBase *CreateEventLoop();
virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);

View File

@@ -43,7 +43,7 @@ public:
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif #endif
virtual bool DoMessageFromThreadWait(); 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); virtual WXDWORD WaitForThread(WXHANDLE hThread);
}; };

View File

@@ -34,7 +34,7 @@ public:
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif #endif
virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
// wxThread helpers // wxThread helpers
// ---------------- // ----------------

View File

@@ -50,7 +50,7 @@ public:
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif #endif
virtual bool DoMessageFromThreadWait(); virtual bool DoMessageFromThreadWait();
virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
}; };
#endif // wxUSE_GUI #endif // wxUSE_GUI

View File

@@ -46,7 +46,7 @@ public:
#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
virtual wxStandardPathsBase& GetStandardPaths(); virtual wxStandardPathsBase& GetStandardPaths();
#endif #endif
virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
#if defined(__WXGTK__) && wxUSE_INTL #if defined(__WXGTK__) && wxUSE_INTL
virtual void SetLocale(); virtual void SetLocale();