projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed src/gtk/eggtrayicon.h
[wxWidgets.git]
/
src
/
xrc
/
xh_frame.cpp
diff --git
a/src/xrc/xh_frame.cpp
b/src/xrc/xh_frame.cpp
index 7d4380076f116837751582d2a5930334cba3baca..2685be16e06aeee8192317d869a7a5ef6e81fede 100644
(file)
--- a/
src/xrc/xh_frame.cpp
+++ b/
src/xrc/xh_frame.cpp
@@
-19,8
+19,11
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_XRC
+
#include "wx/xrc/xh_frame.h"
#include "wx/frame.h"
#include "wx/xrc/xh_frame.h"
#include "wx/frame.h"
+#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/intl.h"
@@
-49,7
+52,6
@@
wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
- XRC_ADD_STYLE(wxCLIP_CHILDREN);
AddWindowStyles();
}
AddWindowStyles();
}
@@
-74,7
+76,7
@@
wxObject *wxFrameXmlHandler::DoCreateResource()
CreateChildren(frame);
CreateChildren(frame);
- if (GetBool(wxT("centered"),
FALSE
))
+ if (GetBool(wxT("centered"),
false
))
frame->Centre();
return frame;
frame->Centre();
return frame;
@@
-84,3
+86,5
@@
bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxFrame"));
}
{
return IsOfClass(node, wxT("wxFrame"));
}
+
+#endif // wxUSE_XRC