projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated list of subprojects.
[wxWidgets.git]
/
src
/
xrc
/
xh_scwin.cpp
diff --git
a/src/xrc/xh_scwin.cpp
b/src/xrc/xh_scwin.cpp
index 886da64ce04f010612ca1914c778cff831456e75..156a3c970be6f1eb72513cf010d061e84535f6d5 100644
(file)
--- a/
src/xrc/xh_scwin.cpp
+++ b/
src/xrc/xh_scwin.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_scwin.cpp
+// Name:
src/xrc/
xh_scwin.cpp
// Purpose: XRC resource for wxScrolledWindow
// Author: Vaclav Slavik
// Created: 2002/10/18
// Purpose: XRC resource for wxScrolledWindow
// Author: Vaclav Slavik
// Created: 2002/10/18
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_scwin.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"
@@
-22,8
+18,11
@@
#if wxUSE_XRC
#include "wx/xrc/xh_scwin.h"
#if wxUSE_XRC
#include "wx/xrc/xh_scwin.h"
-#include "wx/scrolwin.h"
-#include "wx/frame.h" // to get wxNO_3D
+
+#ifndef WX_PRECOMP
+ #include "wx/frame.h"
+ #include "wx/scrolwin.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
@@
-34,7
+33,9
@@
wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler()
XRC_ADD_STYLE(wxVSCROLL);
// wxPanel styles
XRC_ADD_STYLE(wxVSCROLL);
// wxPanel styles
+#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxNO_3D);
+#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);