avoid multiple reallocations in wxString::PrintfV() if vsnprintf() returns the total...

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

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index b88359aa1daf47cc0e2e9e21aaf90c90f86d7ca3..705a3265b6873505d585d045946e6ccaa3154773 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_frame.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"
 


@@ -52,6 +48,8 @@ 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(wxFRAME_EX_METAL);
+    XRC_ADD_STYLE(wxFRAME_EX_CONTEXTHELP);

 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }


@@ -68,7 +66,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
                   GetName());
 
     if (HasParam(wxT("size")))
                   GetName());
 
     if (HasParam(wxT("size")))

-        frame->SetClientSize(GetSize());
+        frame->SetClientSize(GetSize(wxT("size"), frame));

     if (HasParam(wxT("pos")))
         frame->Move(GetPosition());
     if (HasParam(wxT("icon")))
     if (HasParam(wxT("pos")))
         frame->Move(GetPosition());
     if (HasParam(wxT("icon")))