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 85d6423e48c2cde3cf0dafdbbaa8ee204404ce64..622b33ff42db55178423563309316df7a2c73646 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -329,7 +329,7 @@ public:
     }
 
     void OnExit() {
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         Py_DECREF(m_tagHandlerClass);
         m_tagHandlerClass = NULL;
         for (size_t x=0; x < m_objArray.GetCount(); x++) {
@@ -343,7 +343,7 @@ public:
         // Wave our magic wand...  (if it works it's a miracle!  ;-)
 
         // First, make a new instance of the tag handler
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         PyObject* arg = PyTuple_New(0);
         PyObject* obj = PyObject_CallObject(m_tagHandlerClass, arg);
         Py_DECREF(arg);
@@ -647,7 +647,7 @@ public:
     virtual bool CanRead(const wxFSFile& file) const {
         bool rval = false;
         bool found;
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) {
             PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file,false);  // cast away const
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
@@ -663,7 +663,7 @@ public:
     virtual wxString ReadFile(const wxFSFile& file) const {
         wxString rval;
         bool found;
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "ReadFile"))) {
             PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file,false);  // cast away const
             PyObject* ro;
@@ -747,7 +747,7 @@ IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
     bool found;
-    bool blocked = wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) {
         PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
@@ -767,7 +767,7 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
                                                  wxString *redirect) const {
     bool found;
     wxHtmlOpeningStatus rval;
-    bool blocked = wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) {
         PyObject* ro;
         PyObject* s = wx2PyString(url);
@@ -831,7 +831,7 @@ public:
     // Set HTML page and display it. !! source is HTML document itself,
     // it is NOT address/filename of HTML document. If you want to
     // specify document location, use LoadPage() istead
-    // Return value : False if an error occured, True otherwise
+    // Return value : False if an error occurred, True otherwise
     bool SetPage(const wxString& source);
 
     // Load HTML page from given location. Location can be either
@@ -887,7 +887,7 @@ public:
                           const wxString& fixed_face = wxPyEmptyString);
     
     DocDeclStr(
-        void, SetTitle(const wxString& title),
+        void, SetLabel(const wxString& title),
         "", "");
 
     // Sets space between text and window borders.
@@ -1111,7 +1111,8 @@ public:
 };
 
 //---------------------------------------------------------------------------
-
+// WXWIN_COMPATIBILITY_2_4
+#if 0
 struct wxHtmlContentsItem
 {
     %extend {
@@ -1122,7 +1123,7 @@ struct wxHtmlContentsItem
         wxHtmlBookRecord* GetBook() { return self->m_Book; }
     }
 };
-
+#endif
 //---------------------------------------------------------------------------
 
 class wxHtmlSearchStatus
@@ -1135,7 +1136,10 @@ public:
     int GetCurIndex();
     int GetMaxIndex();
     const wxString& GetName();
+    // WXWIN_COMPATIBILITY_2_4
+#if 0
     wxHtmlContentsItem* GetContentsItem();
+#endif
 };
 
 //---------------------------------------------------------------------------
@@ -1158,10 +1162,13 @@ public:
     // TODO: this one needs fixed...
     const wxHtmlBookRecArray& GetBookRecArray();
 
+    // WXWIN_COMPATIBILITY_2_4
+#if 0
     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();
+
+    %pythoncode { def Destroy(self): pass }
 };