X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f01cb2918790cb28f3ca799d885e8a22ad1c2ea..3b96fc2f1b64f78bba7c755a5c14f618962f696b:/src/xrc/xh_unkwn.cpp?ds=sidebyside

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index cad645b68b..c60fd51170 100644
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_unkwn.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,6 +15,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_unkwn.h"
 #include "wx/window.h"
 #include "wx/log.h"
@@ -31,7 +29,7 @@ class wxUnknownControlContainer : public wxPanel
 public:
     wxUnknownControlContainer(wxWindow *parent,
                               const wxString& controlName,
-                              wxWindowID id = -1,
+                              wxWindowID id = wxID_ANY,
                               const wxPoint& pos = wxDefaultPosition,
                               const wxSize& size = wxDefaultSize,
                               long style = 0)
@@ -68,7 +66,6 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
     wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add((wxWindow*)child, 1, wxEXPAND);
     SetSizer(sizer);
-    SetAutoLayout(true);
     Layout();
 }
 
@@ -95,7 +92,7 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
 
     wxPanel *panel =
         new wxUnknownControlContainer(m_parentAsWindow,
-                                      GetName(), -1,
+                                      GetName(), wxID_ANY,
                                       GetPosition(), GetSize(),
                                       GetStyle(wxT("style")));
     SetupWindow(panel);
@@ -107,3 +104,4 @@ bool wxUnknownWidgetXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("unknown"));
 }
 
+#endif // wxUSE_XRC