projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable report view mode under Mac as it hangs the native wxListCtrl implementation...
[wxWidgets.git]
/
src
/
xrc
/
xh_slidr.cpp
diff --git
a/src/xrc/xh_slidr.cpp
b/src/xrc/xh_slidr.cpp
index 9afbf18aa054834b2718c50eeae40470daa85d95..c34926df31ac1273241a871f72f5f1cce4449da5 100644
(file)
--- a/
src/xrc/xh_slidr.cpp
+++ b/
src/xrc/xh_slidr.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_slidr.cpp
+// Name:
src/xrc/
xh_slidr.cpp
// Purpose: XRC resource for wxSlider
// Author: Bob Mitchell
// Created: 2000/03/21
// Purpose: XRC resource for wxSlider
// Author: Bob Mitchell
// Created: 2000/03/21
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_slidr.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-19,15
+15,18
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_X
ML && wxUSE_X
RC && wxUSE_SLIDER
+#if wxUSE_XRC && wxUSE_SLIDER
#include "wx/xrc/xh_slidr.h"
#include "wx/xrc/xh_slidr.h"
-#include "wx/slider.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/slider.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
wxSliderXmlHandler::wxSliderXmlHandler()
IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
wxSliderXmlHandler::wxSliderXmlHandler()
-
:
wxXmlResourceHandler()
+
:
wxXmlResourceHandler()
{
XRC_ADD_STYLE(wxSL_HORIZONTAL);
XRC_ADD_STYLE(wxSL_VERTICAL);
{
XRC_ADD_STYLE(wxSL_HORIZONTAL);
XRC_ADD_STYLE(wxSL_VERTICAL);
@@
-39,6
+38,7
@@
wxSliderXmlHandler::wxSliderXmlHandler()
XRC_ADD_STYLE(wxSL_BOTTOM);
XRC_ADD_STYLE(wxSL_BOTH);
XRC_ADD_STYLE(wxSL_SELRANGE);
XRC_ADD_STYLE(wxSL_BOTTOM);
XRC_ADD_STYLE(wxSL_BOTH);
XRC_ADD_STYLE(wxSL_SELRANGE);
+ XRC_ADD_STYLE(wxSL_INVERSE);
AddWindowStyles();
}
AddWindowStyles();
}
@@
-91,4
+91,4
@@
bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxSlider"));
}
return IsOfClass(node, wxT("wxSlider"));
}
-#endif // wxUSE_X
ML && wxUSE_X
RC && wxUSE_SLIDER
+#endif // wxUSE_XRC && wxUSE_SLIDER