Minor tweaks to bring up to date with CVS changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2006-04-06 02:35:05 +00:00
parent dd8659cac6
commit fdcbb1ce01
2 changed files with 15 additions and 3 deletions

View File

@ -896,8 +896,15 @@ class wxTimeSpan
{ {
public: public:
// TODO: Need an input typemap for wxLongLong...
// return the timespan for the given number of milliseconds
static wxTimeSpan Milliseconds(/*wxLongLong*/ long ms);
static wxTimeSpan Millisecond();
// return the timespan for the given number of seconds // return the timespan for the given number of seconds
static wxTimeSpan Seconds(long sec); static wxTimeSpan Seconds(/*wxLongLong*/ long sec);
static wxTimeSpan Second(); static wxTimeSpan Second();
// return the timespan for the given number of minutes // return the timespan for the given number of minutes
@ -924,8 +931,8 @@ public:
// milliseconds) // milliseconds)
wxTimeSpan(long hours = 0, wxTimeSpan(long hours = 0,
long minutes = 0, long minutes = 0,
long seconds = 0, /*wxLongLong*/ long seconds = 0,
long milliseconds = 0); /*wxLongLong*/ long milliseconds = 0);
~wxTimeSpan(); ~wxTimeSpan();

View File

@ -175,6 +175,11 @@ public:
// void AddText(const char* txt) = 0; // void AddText(const char* txt) = 0;
// void AddTag(const wxHtmlTag& tag); // void AddTag(const wxHtmlTag& tag);
// Returns HTML source inside the element (i.e. between the starting
// and ending tag)
wxString GetInnerSource(const wxHtmlTag& tag);
}; };