X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acd15a3fa015caf2d1e3213a7694b05c92d5b49c..cb719f2e29bd20effa3259d2d7dead9fd857442c:/include/wx/generic/laywin.h

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 7f8b13cb39..0f8ede2e8d 100644
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -15,7 +15,7 @@
 #ifndef _WX_LAYWIN_H_G_
 #define _WX_LAYWIN_H_G_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "laywin.h"
 #endif
 
@@ -24,8 +24,8 @@
 #endif // wxUSE_SASH
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO, 1500)
-    DECLARE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT, 1501)
+    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()
 
 enum wxLayoutOrientation
@@ -59,11 +59,9 @@ enum wxLayoutAlignment
  * orientation and size.
  */
 
-class WXDLLEXPORT wxQueryLayoutInfoEvent: public wxEvent
+class WXDLLIMPEXP_ADV wxQueryLayoutInfoEvent: public wxEvent
 {
-DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 public:
-
     wxQueryLayoutInfoEvent(wxWindowID id = 0)
     {
         SetEventType(wxEVT_QUERY_LAYOUT_INFO);
@@ -100,20 +98,21 @@ protected:
     wxLayoutOrientation     m_orientation;
     wxLayoutAlignment       m_alignment;
 
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryLayoutInfoEvent)
 };
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 
 #define EVT_QUERY_LAYOUT_INFO(func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_LAYOUT_INFO, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryLayoutInfoEventFunction) & func, NULL ),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_LAYOUT_INFO, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxQueryLayoutInfoEventFunction, & func ), NULL ),
 
 /*
  * This event is used to take a bite out of the available client area.
  */
 
-class WXDLLEXPORT wxCalculateLayoutEvent: public wxEvent
+class WXDLLIMPEXP_ADV wxCalculateLayoutEvent: public wxEvent
 {
-DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)
 public:
     wxCalculateLayoutEvent(wxWindowID id = 0)
     {
@@ -135,35 +134,37 @@ public:
 protected:
     int                     m_flags;
     wxRect                  m_rect;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalculateLayoutEvent)
 };
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 
 #define EVT_CALCULATE_LAYOUT(func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL ),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxCalculateLayoutEventFunction, & func ), NULL ),
 
 #if wxUSE_SASH
 
 // This is window that can remember alignment/orientation, does its own layout,
 // and can provide sashes too. Useful for implementing docked windows with sashes in
 // an IDE-style interface.
-class WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow
+class WXDLLIMPEXP_ADV wxSashLayoutWindow: public wxSashWindow
 {
-    DECLARE_CLASS(wxSashLayoutWindow)
 public:
     wxSashLayoutWindow()
     {
         Init();
     }
 
-    wxSashLayoutWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow")
+    wxSashLayoutWindow(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow"))
     {
         Create(parent, id, pos, size, style, name);
     }
 
-    bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow");
+    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow"));
 
 // Accessors
     inline wxLayoutAlignment GetAlignment() const { return m_alignment; };
@@ -190,7 +191,9 @@ private:
     wxLayoutOrientation         m_orientation;
     wxSize                      m_defaultSize;
 
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashLayoutWindow)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // wxUSE_SASH
@@ -199,7 +202,7 @@ class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm
-class WXDLLEXPORT wxLayoutAlgorithm: public wxObject
+class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject
 {
 public:
     wxLayoutAlgorithm() {}