avoid a bug in Carbon headers

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

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 50bcf4f5d16498e4c9c29bf352d22315aca14377..91106240ee25c836707d862363551946ab0930eb 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 

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

 #pragma interface "mdi.h"
 #endif
 
 #pragma interface "mdi.h"
 #endif
 


@@ -27,9 +27,6 @@ but wxMDIChildFrame::GetParent should return the parent frame.
 #include "wx/frame.h"
 #include "wx/notebook.h"
 
 #include "wx/frame.h"
 #include "wx/notebook.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
-

 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 


@@ -152,7 +149,8 @@ public:
     
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
     
     // Set icon
     virtual void SetIcon(const wxIcon& icon);

-    
+    virtual void SetIcons(const wxIconBundle& icons );
+

     // Override wxFrame operations
     void CaptureMouse();
     void ReleaseMouse();
     // Override wxFrame operations
     void CaptureMouse();
     void ReleaseMouse();


@@ -230,6 +228,8 @@ public:
     
     // Implementation
     void OnPageChanged(wxNotebookEvent& event);
     
     // Implementation
     void OnPageChanged(wxNotebookEvent& event);

+
+    int FindPage(const wxNotebookPage* page);

     
 protected:
     virtual void DoSetSize(int x, int y,
     
 protected:
     virtual void DoSetSize(int x, int y,


@@ -241,7 +241,6 @@ protected:
     void DoGetSize(int *width, int *height) const ;
     void DoGetPosition(int *x, int *y) const ;
     
     void DoGetSize(int *width, int *height) const ;
     void DoGetPosition(int *x, int *y) const ;
     

-    

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };