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:
parent
27d335cc23
commit
1f5c66294a
@ -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"
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
@ -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
|
||||
// ----------------
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user