Applied patch [ 807164 ] fixes for core library

[wxWidgets.git] / contrib / utils / wxrcedit / preview.h

diff --git a/contrib/utils/wxrcedit/preview.h b/contrib/utils/wxrcedit/preview.h
index 6675c4f75242ff6fed3fb6f6f6b828abdbbb8de8..e9e558a8337f6618f63958ef17616801bafe004d 100644 (file)
--- a/contrib/utils/wxrcedit/preview.h
+++ b/contrib/utils/wxrcedit/preview.h
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "preview.h"
 #endif
 
@@ -31,21 +31,24 @@ class PreviewFrame : public wxFrame
         PreviewFrame();
         ~PreviewFrame();
         
-        void Preview(wxXmlNode *node);
+        void Preview(wxXmlNode *node,wxXmlDocument *doc);
         void MakeDirty();
                 // current node updated, needs preview refresh
                 // (will be done once mouse enters preview win)
       
         static PreviewFrame *Get();
+        void ResetResource();
         
     private:
         void PreviewMenu();
         void PreviewToolbar();
         void PreviewPanel();
+               void PreviewWXFrame();
     
     private:
         static PreviewFrame *ms_Instance;
         wxXmlNode *m_Node;
+        wxXmlDocument *m_Doc;
         wxScrolledWindow *m_ScrollWin;
         wxTextCtrl *m_LogCtrl;
         wxSplitterWindow *m_Splitter;
@@ -57,9 +60,6 @@ class PreviewFrame : public wxFrame
         
         DECLARE_EVENT_TABLE()
         void OnMouseEnter(wxMouseEvent& event);
-#ifdef __WXMSW__
-        void OnActivate(wxActivateEvent &event);
-#endif
 };