From 50ec54b6564af84ca1280005b6659264a598abb7 Mon Sep 17 00:00:00 2001
From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Mon, 27 Oct 2008 21:18:55 +0000
Subject: [PATCH] other ifacecheck fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 interface/wx/dataobj.h      |  9 +++++----
 interface/wx/dataview.h     | 12 +++++++-----
 interface/wx/html/winpars.h |  6 ++----
 interface/wx/object.h       |  2 +-
 interface/wx/thread.h       |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/interface/wx/dataobj.h b/interface/wx/dataobj.h
index 830a4c1a9f..395686a034 100644
--- a/interface/wx/dataobj.h
+++ b/interface/wx/dataobj.h
@@ -80,7 +80,7 @@ public:
         object by pickling it first.
         @endWxPythonOnly
     */
-    virtual void SetData(size_t size, const void data);
+    virtual void SetData(size_t size, const void* data);
 
     /**
         Like SetData(), but doesn't copy the data - instead the object takes
@@ -190,7 +190,7 @@ public:
         required and the data should be returned from the method as a string.
         @endWxPythonOnly
     */
-    virtual bool GetDataHere(void buf) const;
+    virtual bool GetDataHere(void* buf) const;
 
     /**
         Gets the size of our data. Must be implemented in the derived class if
@@ -214,7 +214,7 @@ public:
         string parameter rather than the two shown here.
         @endWxPythonOnly
     */
-    virtual bool SetData(size_t len, const void buf);
+    virtual bool SetData(size_t len, const void* buf);
 
     /**
         Sets the supported format.
@@ -656,7 +656,8 @@ public:
         to by @a formats. There is enough space for GetFormatCount(dir) formats
         in it.
     */
-    virtual void GetAllFormats(wxDataFormat* formats, Direction dir = Get) const;
+    virtual void GetAllFormats(wxDataFormat* formats,
+                               Direction dir = Get) const = 0;
 
     /**
         The method will write the data of the format @a format in the buffer
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index caa53fbdc8..9e12071e23 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -877,7 +877,7 @@ public:
     /**
         Deletes given column.
     */
-    virtual bool DeleteColumn(const wxDataViewColumn* column);
+    virtual bool DeleteColumn(wxDataViewColumn* column);
 
     /**
         Call this to ensure that the given item is visible.
@@ -1320,7 +1320,8 @@ public:
         The ctor.
     */
     wxDataViewToggleRenderer(const wxString& varianttype = "bool",
-                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
+                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                             int align = wxDVR_DEFAULT_ALIGNMENT);
 };
 
 
@@ -1340,7 +1341,8 @@ public:
         The ctor.
     */
     wxDataViewDateRenderer(const wxString& varianttype = "datetime",
-                           wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE);
+                           wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
+                           int align = wxDVR_DEFAULT_ALIGNMENT);
 };
 
 
@@ -1484,7 +1486,7 @@ public:
         This will ensure that the correct colour, font and vertical alignment will
         be chosen so the text will look the same as text drawn by native renderers.
     */
-    bool RenderText(const wxString& text, int xoffset, wxRect cell,
+    void RenderText(const wxString& text, int xoffset, wxRect cell,
                     wxDC* dc, int state);
 
     /**
@@ -1621,7 +1623,7 @@ public:
 
     /**
         Set the bitmap of the column header.
-    */e
+    */
     virtual void SetBitmap(const wxBitmap& bitmap);
 
     /**
diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h
index 97a39b1e49..2dd6562631 100644
--- a/interface/wx/html/winpars.h
+++ b/interface/wx/html/winpars.h
@@ -78,16 +78,14 @@ protected:
 class wxHtmlWinParser : public wxHtmlParser
 {
 public:
-    wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
-
     /**
         Constructor.
 
-        Don't use the default one, use constructor with @a wndIface parameter
+        Don't use the default one, use the constructor with @a wndIface parameter
         (@a wndIface is a pointer to interface object for the associated wxHtmlWindow
         or other HTML rendering window such as wxHtmlListBox).
     */
-    wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
+    wxHtmlWinParser(wxHtmlWindowInterface* wndIface = NULL);
 
     /**
         Adds module() to the list of wxHtmlWinParser tag handler.
diff --git a/interface/wx/object.h b/interface/wx/object.h
index a526b79d5a..55814598ef 100644
--- a/interface/wx/object.h
+++ b/interface/wx/object.h
@@ -409,7 +409,7 @@ public:
     /**
         Returns @true if this class is a kind of (inherits from) the given class.
     */
-    bool IsKindOf(const wxClassInfo* info);
+    bool IsKindOf(const wxClassInfo* info) const;
 };
 
 
diff --git a/interface/wx/thread.h b/interface/wx/thread.h
index f530c12157..1038b6120a 100644
--- a/interface/wx/thread.h
+++ b/interface/wx/thread.h
@@ -151,7 +151,7 @@ public:
 
         @see Broadcast()
     */
-    void Signal();
+    wxCondError Signal();
 
     /**
         Waits until the condition is signalled.
-- 
2.45.2