check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

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

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index ea823db9649f2b6292c2bdd9f668d94f69264efd..7607e53b1fff15e241b7a1e5731364986a8a2332 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_dlg.h"
 #endif
 
 #pragma implementation "xh_dlg.h"
 #endif
 


@@ -19,8 +19,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_dlg.h"
 #include "wx/dialog.h"
 #include "wx/xrc/xh_dlg.h"
 #include "wx/dialog.h"

+#include "wx/frame.h"

 #include "wx/log.h"
 #include "wx/intl.h"
 
 #include "wx/log.h"
 #include "wx/intl.h"
 


@@ -38,13 +41,16 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxCLOSE_BOX);
     XRC_ADD_STYLE(wxDIALOG_MODAL);
     XRC_ADD_STYLE(wxDIALOG_MODELESS);
     XRC_ADD_STYLE(wxCLOSE_BOX);
     XRC_ADD_STYLE(wxDIALOG_MODAL);
     XRC_ADD_STYLE(wxDIALOG_MODELESS);

+    XRC_ADD_STYLE(wxDIALOG_NO_PARENT);

 
     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(wxCLIP_CHILDREN);
+    XRC_ADD_STYLE(wxDIALOG_EX_METAL);

     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
     XRC_ADD_STYLE(wxMINIMIZE_BOX);
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
     XRC_ADD_STYLE(wxMINIMIZE_BOX);

+    XRC_ADD_STYLE(wxFRAME_SHAPED);
+    XRC_ADD_STYLE(wxDIALOG_EX_CONTEXTHELP);

 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }


@@ -61,15 +67,17 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
                 GetName());
 
     if (HasParam(wxT("size")))
                 GetName());
 
     if (HasParam(wxT("size")))

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

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

+    if (HasParam(wxT("icon")))
+        dlg->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));

 
     SetupWindow(dlg);
 
     CreateChildren(dlg);
 
 
     SetupWindow(dlg);
 
     CreateChildren(dlg);
 

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

         dlg->Centre();
 
     return dlg;
         dlg->Centre();
 
     return dlg;


@@ -79,3 +87,5 @@ bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxDialog"));
 }
 {
     return IsOfClass(node, wxT("wxDialog"));
 }

+
+#endif // wxUSE_XRC