Added wx.GetColourFromUser and wx.GetFontFromUser

[wxWidgets.git] / wxPython / src / html.i

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index ae58dc2a827a6ff521a7dcb8cfa60ad2f23c7e4a..622b33ff42db55178423563309316df7a2c73646 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -887,7 +887,7 @@ public:
                           const wxString& fixed_face = wxPyEmptyString);
     
     DocDeclStr(
                           const wxString& fixed_face = wxPyEmptyString);
     
     DocDeclStr(

-        void, SetTitle(const wxString& title),
+        void, SetLabel(const wxString& title),

         "", "");
 
     // Sets space between text and window borders.
         "", "");
 
     // Sets space between text and window borders.


@@ -1111,7 +1111,8 @@ public:
 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------

-
+// WXWIN_COMPATIBILITY_2_4
+#if 0

 struct wxHtmlContentsItem
 {
     %extend {
 struct wxHtmlContentsItem
 {
     %extend {


@@ -1122,7 +1123,7 @@ struct wxHtmlContentsItem
         wxHtmlBookRecord* GetBook() { return self->m_Book; }
     }
 };
         wxHtmlBookRecord* GetBook() { return self->m_Book; }
     }
 };

-
+#endif

 //---------------------------------------------------------------------------
 
 class wxHtmlSearchStatus
 //---------------------------------------------------------------------------
 
 class wxHtmlSearchStatus


@@ -1135,7 +1136,10 @@ public:
     int GetCurIndex();
     int GetMaxIndex();
     const wxString& GetName();
     int GetCurIndex();
     int GetMaxIndex();
     const wxString& GetName();

+    // WXWIN_COMPATIBILITY_2_4
+#if 0

     wxHtmlContentsItem* GetContentsItem();
     wxHtmlContentsItem* GetContentsItem();

+#endif

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -1158,10 +1162,13 @@ public:
     // TODO: this one needs fixed...
     const wxHtmlBookRecArray& GetBookRecArray();
 
     // TODO: this one needs fixed...
     const wxHtmlBookRecArray& GetBookRecArray();
 

+    // WXWIN_COMPATIBILITY_2_4
+#if 0

     wxHtmlContentsItem* GetContents();
     int GetContentsCnt();
     wxHtmlContentsItem* GetIndex();
     int GetIndexCnt();
     wxHtmlContentsItem* GetContents();
     int GetContentsCnt();
     wxHtmlContentsItem* GetIndex();
     int GetIndexCnt();

+#endif

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -1227,6 +1234,8 @@ public:
     void ReadCustomization(wxConfigBase *cfg, wxString path = wxPyEmptyString);
     void WriteCustomization(wxConfigBase *cfg, wxString path = wxPyEmptyString);
     wxHtmlHelpFrame* GetFrame();
     void ReadCustomization(wxConfigBase *cfg, wxString path = wxPyEmptyString);
     void WriteCustomization(wxConfigBase *cfg, wxString path = wxPyEmptyString);
     wxHtmlHelpFrame* GetFrame();

+
+    %pythoncode { def Destroy(self): pass }

 };
 
 
 };