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

diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i
index d03feb00ffce2840a91d944e34a1deda06051f19..322c03a7eb5e4ba16c950c8b9b8b0949418824b3 100644 (file)
--- a/wxPython/src/_datetime.i
+++ b/wxPython/src/_datetime.i
@@ -895,9 +895,16 @@ public:
 class wxTimeSpan
 {
 public:
 class wxTimeSpan
 {
 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();
 
         // return the timespan for the given number of minutes
     static wxTimeSpan Second();
 
         // return the timespan for the given number of minutes


@@ -924,8 +931,8 @@ public:
         // milliseconds)
     wxTimeSpan(long hours = 0,
                long minutes = 0,
         // milliseconds)
     wxTimeSpan(long hours = 0,
                long minutes = 0,

-               long seconds = 0,
-               long milliseconds = 0);
+               /*wxLongLong*/ long seconds = 0,
+               /*wxLongLong*/ long milliseconds = 0);

 
     ~wxTimeSpan();
 
 
     ~wxTimeSpan();
 

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index b2a8fd5f1286be05ae5f560626a2b557e59943d5..53f8b456b04a14eb4032b39cb4eff628b20b2667 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -175,6 +175,11 @@ public:
 
     // void AddText(const char* txt) = 0;
     // void AddTag(const wxHtmlTag& tag);
 
     // void AddText(const char* txt) = 0;
     // void AddTag(const wxHtmlTag& tag);

+
+    
+    // Returns HTML source inside the element (i.e. between the starting
+    // and ending tag)
+    wxString GetInnerSource(const wxHtmlTag& tag);   

 };
 
 
 };