added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

[wxWidgets.git] / include / wx / gtk1 / mdi.h

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 3dd4ca65303d3f93f039142f354d7465a4a3c104..f5fea52d5acae03585ae05b4b7dadd18f033df6a 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -11,7 +11,7 @@
 #ifndef __MDIH__
 #define __MDIH__
 
 #ifndef __MDIH__
 #define __MDIH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


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

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

 
     // no title
     void SetTitle( const wxString &title );
 
     // no title
     void SetTitle( const wxString &title );


@@ -183,6 +184,11 @@ public:
     bool               m_justInserted;
 
 protected:
     bool               m_justInserted;
 
 protected:

+    // override wxFrame methods to not do anything
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);

     virtual void DoGetClientSize( int *width, int *height ) const;
 
 private:
     virtual void DoGetClientSize( int *width, int *height ) const;
 
 private: