X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6956d86c7f4696bf1187946811fb923f1af56a3..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/generic/laywin.h?ds=sidebyside diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index b2ffb7e536..0539989a5f 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -21,10 +21,8 @@ #include "wx/event.h" -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() +extern WXDLLIMPEXP_ADV const wxEventType wxEVT_QUERY_LAYOUT_INFO; +extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALCULATE_LAYOUT; enum wxLayoutOrientation { @@ -165,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; } @@ -196,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