Applied patch [ 809066 ] Cleanup for text2rtf

[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 7b5d003943679049b86a3ef8df4e4facc80408c9..2fcbbd357f632b13860495d11e712ef9d3196e28 100644 (file)
--- a/contrib/src/xrc/xh_frame.cpp
+++ b/contrib/src/xrc/xh_frame.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_frame.cpp

-// Purpose:     XML resource for dialogs
+// Purpose:     XRC resource for dialogs

 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // 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,62 +24,61 @@
 #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()
 {

-    ADD_STYLE(wxSTAY_ON_TOP);
-    ADD_STYLE(wxCAPTION);
-    ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    ADD_STYLE(wxDEFAULT_FRAME_STYLE);
-    ADD_STYLE(wxTHICK_FRAME);
-    ADD_STYLE(wxSYSTEM_MENU);
-    ADD_STYLE(wxRESIZE_BORDER);
-    ADD_STYLE(wxRESIZE_BOX);
-
-    ADD_STYLE(wxFRAME_TOOL_WINDOW);
-    ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
-    ADD_STYLE(wxMAXIMIZE_BOX);
-    ADD_STYLE(wxMINIMIZE_BOX);
-    ADD_STYLE(wxSTAY_ON_TOP);
-
-    ADD_STYLE(wxNO_3D);
-    ADD_STYLE(wxTAB_TRAVERSAL);
-    ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    ADD_STYLE(wxCLIP_CHILDREN);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+    XRC_ADD_STYLE(wxCAPTION);
+    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
+    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
+    XRC_ADD_STYLE(wxTHICK_FRAME);
+    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(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 

-
-

 wxObject *wxFrameXmlHandler::DoCreateResource()
 wxObject *wxFrameXmlHandler::DoCreateResource()

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

     frame->Create(m_parentAsWindow,
     frame->Create(m_parentAsWindow,

-                GetID(),
-                GetText(_T("title")),
-                wxDefaultPosition, wxDefaultSize,
-                GetStyle(_T("style"), wxDEFAULT_FRAME_STYLE),
-                GetName());
-    frame->SetClientSize(GetSize());
-    frame->Move(GetPosition());
+                  GetID(),
+                  GetText(wxT("title")),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
+                  GetName());
+
+    if (HasParam(wxT("size")))
+        frame->SetClientSize(GetSize());
+    if (HasParam(wxT("pos")))
+        frame->Move(GetPosition());
+

     SetupWindow(frame);
 
     CreateChildren(frame);
     SetupWindow(frame);
 
     CreateChildren(frame);

-    
-    if (GetBool(_("centered"), FALSE))
+
+    if (GetBool(wxT("centered"), FALSE))

         frame->Centre();
         frame->Centre();

-    
+

     return frame;
 }
 
     return frame;
 }
 

-
-

 bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
 {
 bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return IsOfClass(node, _T("wxFrame"));
+    return IsOfClass(node, wxT("wxFrame"));

 }
 }

-
-