Changes that were in aclocal.m4 but not here

[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 d4e47c1fff995ef8c5fd76ba608260a15bef3080..2fcbbd357f632b13860495d11e712ef9d3196e28 100644 (file)
--- a/contrib/src/xrc/xh_frame.cpp
+++ b/contrib/src/xrc/xh_frame.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_frame.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_frame.h"
 #endif


@@ -24,6 +24,7 @@
 #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,6 +36,7 @@ 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_BOX);

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


@@ -51,11 +53,9 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
 }
 
 wxObject *wxFrameXmlHandler::DoCreateResource()
 }
 
 wxObject *wxFrameXmlHandler::DoCreateResource()

-{ 
-    wxFrame *frame = wxDynamicCast(m_instance, wxFrame);
-    
-    wxASSERT_MSG(frame, _("XRC resource: Cannot create dialog without instance."));
-    
+{
+    XRC_MAKE_INSTANCE(frame, wxFrame);
+

     frame->Create(m_parentAsWindow,
                   GetID(),
                   GetText(wxT("title")),
     frame->Create(m_parentAsWindow,
                   GetID(),
                   GetText(wxT("title")),


@@ -71,10 +71,10 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
     SetupWindow(frame);
 
     CreateChildren(frame);
     SetupWindow(frame);
 
     CreateChildren(frame);

-    
+

     if (GetBool(wxT("centered"), FALSE))
         frame->Centre();
     if (GetBool(wxT("centered"), FALSE))
         frame->Centre();

-    
+

     return frame;
 }
 
     return frame;
 }