X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5340966638dba7bcbd960913a0fc010dd1de4883..77c1fa98ce364fb1c2b31a82bdd04f3a0ab75424:/include/wx/generic/laywin.h?ds=sidebyside diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index ef1c162d9f..a2336325a1 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -15,14 +15,12 @@ #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 +#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) @@ -167,11 +165,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 +182,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 +196,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