X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..d8359d3ca077993d3ef61d6c09000ce7beeb577b:/include/wx/splitter.h?ds=sidebyside diff --git a/include/wx/splitter.h b/include/wx/splitter.h index b2a7cad532..2956b8b21d 100644 --- a/include/wx/splitter.h +++ b/include/wx/splitter.h @@ -19,6 +19,7 @@ // ---------------------------------------------------------------------------- #define wxSP_NOBORDER 0x0000 +#define wxSP_THIN_SASH 0x0000 // NB: the default is 3D sash #define wxSP_NOSASH 0x0010 #define wxSP_PERMIT_UNSPLIT 0x0040 #define wxSP_LIVE_UPDATE 0x0080 @@ -28,18 +29,19 @@ #define wxSP_BORDER wxSP_3DBORDER #define wxSP_3D (wxSP_3DBORDER | wxSP_3DSASH) -// obsolete styles, don't do anything -#define wxSP_SASH_AQUA 0 -#define wxSP_FULLSASH 0 +#if WXWIN_COMPATIBILITY_2_6 + // obsolete styles, don't do anything + #define wxSP_SASH_AQUA 0 + #define wxSP_FULLSASH 0 +#endif // WXWIN_COMPATIBILITY_2_6 -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 850) - DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 851) - DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 852) - DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT, 853) -END_DECLARE_EVENT_TYPES() +class WXDLLIMPEXP_FWD_CORE wxSplitterEvent; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent ) +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent ) +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, wxSplitterEvent ) +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_UNSPLIT, wxSplitterEvent ) #include "wx/generic/splitter.h" -#endif - // _WX_SPLITTER_H_BASE_ +#endif // _WX_SPLITTER_H_BASE_