gcc is too aggressively hiding these inlines on wxCriticialSection on osx, expose...

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

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index ef1c162d9fec39ea471c9d30edc89e5687d58a7a..0539989a5fc43215ab40d2996e9f151a48e3c640 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -15,18 +15,14 @@
 #ifndef _WX_LAYWIN_H_G_
 #define _WX_LAYWIN_H_G_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "laywin.h"
-#endif
-
 #if wxUSE_SASH
     #include "wx/sashwin.h"
 #endif // wxUSE_SASH
 
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, 1500)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT, 1501)
-END_DECLARE_EVENT_TYPES()
+#include "wx/event.h"
+
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_QUERY_LAYOUT_INFO;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALCULATE_LAYOUT;
 
 enum wxLayoutOrientation
 {
@@ -167,11 +163,11 @@ public:
         const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow"));
 
 // Accessors
-    inline wxLayoutAlignment GetAlignment() const { return m_alignment; };
-    inline wxLayoutOrientation GetOrientation() const { return m_orientation; };
+    inline wxLayoutAlignment GetAlignment() const { return m_alignment; }
+    inline wxLayoutOrientation GetOrientation() const { return m_orientation; }
 
-    inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; };
-    inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; };
+    inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
+    inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }
 
     // Give the window default dimensions
     inline void SetDefaultSize(const wxSize& size) { m_defaultSize = size; }
@@ -184,10 +180,6 @@ public:
     // Called by layout algorithm to retrieve information about the window.
     void OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event);
 
-#ifdef __WXMAC__
-    virtual bool MacClipChildren() const { return true ; }
-#endif
-
 private:
     void Init();
 
@@ -202,8 +194,8 @@ private:
 
 #endif // wxUSE_SASH
 
-class WXDLLEXPORT wxMDIParentFrame;
-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
 
 // This class implements the layout algorithm
 class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject