removed src/gtk/eggtrayicon.h

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

diff --git a/contrib/utils/wxrcedit/edapp.cpp b/contrib/utils/wxrcedit/edapp.cpp
index 2ad0a59b05e04ecab02272d8d60d02ad30a2bceb..dc2edda79cfc4e6f84483f424ebd1fc7553c2d13 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


@@ -20,7 +20,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif


@@ -30,7 +30,8 @@
 #include "wx/wx.h"
 
 #include "editor.h"
 #include "wx/wx.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()
 {

-    wxString arg = (argc >= 1) ? argv[1] : "";
+    SetVendorName(wxT("wxWidgets"));
+    SetAppName(wxT("wxrcedit"));
+    wxString arg = (argc >= 1) ? argv[1] : _T("");

     wxInitAllImageHandlers();
     wxFrame *frame = new EditorFrame(NULL, arg);
     SetTopWindow(frame);
     wxInitAllImageHandlers();
     wxFrame *frame = new EditorFrame(NULL, arg);
     SetTopWindow(frame);

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

 }
 
 }