fixes to dependency problems in win32 makefiles

[wxWidgets.git] / contrib / utils / wxrcedit / edapp.cpp

diff --git a/contrib/utils/wxrcedit/edapp.cpp b/contrib/utils/wxrcedit/edapp.cpp
index ad65e05c1fe4a2c41304e2fe194334836bdfafe4..10a151c8914e52bad8fbdc0e997a80a0a023a306 100644 (file)
--- a/contrib/utils/wxrcedit/edapp.cpp
+++ b/contrib/utils/wxrcedit/edapp.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma implementation
     #pragma interface
 #endif
     #pragma implementation
     #pragma interface
 #endif


@@ -25,12 +25,13 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#include "wx/xml/xml.h"
+#include "wx/xrc/xml.h"

 #include "wx/image.h"
 #include "wx/image.h"

-
+#include "wx/wx.h"

 
 #include "editor.h"
 
 #include "editor.h"

-
+#include "preview.h"
+#include "propframe.h"

 
 
 // -- Application
 
 
 // -- Application


@@ -46,11 +47,15 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+    SetVendorName(wxT("wxWindows"));
+    SetAppName(wxT("wxrcedit"));

     wxString arg = (argc >= 1) ? argv[1] : "";
     wxInitAllImageHandlers();
     wxFrame *frame = new EditorFrame(NULL, arg);
     SetTopWindow(frame);
     frame->Show(TRUE);
     wxString arg = (argc >= 1) ? argv[1] : "";
     wxInitAllImageHandlers();
     wxFrame *frame = new EditorFrame(NULL, arg);
     SetTopWindow(frame);
     frame->Show(TRUE);

+    PreviewFrame::Get()->Show(TRUE);
+    PropertiesFrame::Get()->Show(TRUE);

     return TRUE;
 }
 
     return TRUE;
 }