projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use fallback encoding in wxConvAuto when input is not in UTF-8
[wxWidgets.git]
/
src
/
xrc
/
xh_scrol.cpp
diff --git
a/src/xrc/xh_scrol.cpp
b/src/xrc/xh_scrol.cpp
index dd330bb78b0d25296faded9d38afdec399fa96af..3916339bd53c8c28c67768185926b9d45ab48086 100644
(file)
--- a/
src/xrc/xh_scrol.cpp
+++ b/
src/xrc/xh_scrol.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_scrol.cpp
+// Name:
src/xrc/
xh_scrol.cpp
// Purpose: XRC resource for wxScrollBar
// Author: Brian Gavin
// Created: 2000/09/09
// Purpose: XRC resource for wxScrollBar
// Author: Brian Gavin
// Created: 2000/09/09
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_scrol.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,10
+15,13
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_XRC
+#if wxUSE_XRC
&& wxUSE_SCROLLBAR
#include "wx/xrc/xh_scrol.h"
#include "wx/xrc/xh_scrol.h"
-#include "wx/scrolbar.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/scrolbar.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler)
@@
-61,4
+60,4
@@
bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxScrollBar"));
}
return IsOfClass(node, wxT("wxScrollBar"));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_SCROLLBAR