Patch #826420, and also adapted to new SWIG

[wxWidgets.git] / include / wx / generic / mdig.h

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 715f4a22d3383a5209861c559765c0328b4c2228..1f6a7311de3e2774028937319dae7624e4bcfca4 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MDIG_H_
 #define _WX_MDIG_H_
 
 #ifndef _WX_MDIG_H_
 #define _WX_MDIG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "mdig.h"
 #endif
 
     #pragma interface "mdig.h"
 #endif
 


@@ -175,8 +175,8 @@ public:
 #endif
 
     // no icon
 #endif
 
     // no icon

-    void SetIcon( const wxIcon &icon ) { /*m_icons = wxIconBundle( icon );*/}
-    void SetIcons( const wxIconBundle &icons ) { /*m_icons = icons;*/ }
+    void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
+    void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }

 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ }
 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ }


@@ -237,7 +237,7 @@ public:
     ~wxGenericMDIClientWindow();
     virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
     ~wxGenericMDIClientWindow();
     virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 

-    virtual int SetSelection(int nPage);
+    virtual int SetSelection(size_t nPage);

 
 protected:
     void PageChanged(int OldSelection, int newSelection);
 
 protected:
     void PageChanged(int OldSelection, int newSelection);