Warning corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 4ef1065d3ebeab3a868b8d051124d5b9ecf22f8d..606e297b6f2b6cd23aaece9000b3a9bdc5f40c0e 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -68,7 +68,7 @@ public:
     // --------------------------------------
 
     virtual int SetSelection(size_t nPage);
     // --------------------------------------
 
     virtual int SetSelection(size_t nPage);

-    virtual int GetSelection() const { return m_sel; }
+    virtual int GetSelection() const { return (int) m_sel; }

 
     virtual bool SetPageText(size_t nPage, const wxString& strText);
     virtual wxString GetPageText(size_t nPage) const;
 
     virtual bool SetPageText(size_t nPage, const wxString& strText);
     virtual wxString GetPageText(size_t nPage) const;

diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 67cf04bc1ee871f73b71a3db87d8120d1253e40b..eee6327faf5fa1949deb2bdc80696c1c73d429eb 100644 (file)
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -88,7 +88,7 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 

-    virtual int GetCount() const { return m_buttons.GetCount(); }
+    virtual int GetCount() const { return (int) m_buttons.GetCount(); }

     virtual int GetColumnCount() const { return m_numCols; }
     virtual int GetRowCount() const { return m_numRows; }
 
     virtual int GetColumnCount() const { return m_numCols; }
     virtual int GetRowCount() const { return m_numRows; }