X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58580a7e3cf744de919827f827f14e595f8231af..01002a3525ac7eee5b31c6c4506121d37dde88c6:/contrib/include/wx/gizmos/multicell.h diff --git a/contrib/include/wx/gizmos/multicell.h b/contrib/include/wx/gizmos/multicell.h index b200c05155..f4cab3fffb 100644 --- a/contrib/include/wx/gizmos/multicell.h +++ b/contrib/include/wx/gizmos/multicell.h @@ -4,7 +4,7 @@ // Author: Jonathan Bayer // Modified by: // Created: -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jonathan Bayer // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,10 +15,12 @@ #ifndef __WX_MULTICELL_H__ #define __WX_MULTICELL_H__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "multicell.h" #endif +#include "wx/gizmos/gizmos.h" + // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -32,7 +34,7 @@ enum wxResizable { wxNOT_RESIZABLE = 0x00, - wxHORIZENTAL_RESIZABLE = 0x01, + wxHORIZONTAL_RESIZABLE = 0x01, wxVERTICAL_RESIZABLE = 0x10, wxRESIZABLE = 0x11 }; @@ -45,7 +47,7 @@ enum wxResizable // wxMultiCellItemHandle //--------------------------------------------------------------------------- -class WXDLLEXPORT wxMultiCellItemHandle: public wxObject +class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject { DECLARE_CLASS(wxMultiCellItemHandle); protected: @@ -81,7 +83,7 @@ private: // wxMultiCellSizer //--------------------------------------------------------------------------- -class WXDLLEXPORT wxMultiCellSizer : virtual public wxSizer +class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer { DECLARE_CLASS(wxMultiCellSizer); @@ -131,7 +133,7 @@ class wxCell; // wxMultiCellCanvas //--------------------------------------------------------------------------- -class wxMultiCellCanvas : public wxFlexGridSizer +class WXDLLIMPEXP_GIZMOS wxMultiCellCanvas : public wxFlexGridSizer { public: wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);