disable the first top level parent, not the topmost top level parent

[wxWidgets.git] / contrib / src / xrc / xh_frame.cpp

diff --git a/contrib/src/xrc/xh_frame.cpp b/contrib/src/xrc/xh_frame.cpp
index daa12424e6be1824b5e3e7fda5b6916f53d3ed4b..520b265ca6c878d84d1adcc0a02c53a904e2da2b 100644 (file)
--- a/contrib/src/xrc/xh_frame.cpp
+++ b/contrib/src/xrc/xh_frame.cpp
@@ -21,9 +21,11 @@
 
 #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"
 

+IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)

 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
 {
 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
 {


@@ -35,8 +37,10 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxSYSTEM_MENU);
     XRC_ADD_STYLE(wxRESIZE_BORDER);
     XRC_ADD_STYLE(wxRESIZE_BOX);
     XRC_ADD_STYLE(wxSYSTEM_MENU);
     XRC_ADD_STYLE(wxRESIZE_BORDER);
     XRC_ADD_STYLE(wxRESIZE_BOX);

-    XRC_ADD_STYLE(wxCLOSE);
+    XRC_ADD_STYLE(wxCLOSE_BOX);

 
 

+    XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
+    XRC_ADD_STYLE(wxFRAME_SHAPED);

     XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
     XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
     XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
     XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);