Elliptic arc fix for getting bounds

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

diff --git a/contrib/utils/wxrcedit/preview.h b/contrib/utils/wxrcedit/preview.h
index 538ea3e157423096462262608cc6a196017d67aa..014e91ba24312fa6eda13188d78ae761fc476ac6 100644 (file)
--- a/contrib/utils/wxrcedit/preview.h
+++ b/contrib/utils/wxrcedit/preview.h
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma interface "preview.h"
 #endif
 
     #pragma interface "preview.h"
 #endif
 


@@ -30,33 +30,36 @@ class PreviewFrame : public wxFrame
     public:
         PreviewFrame();
         ~PreviewFrame();
     public:
         PreviewFrame();
         ~PreviewFrame();

-        
-        void Preview(wxXmlNode *node,const wxString &version);
+
+        void Preview(wxXmlNode *node,wxXmlDocument *doc);

         void MakeDirty();
                 // current node updated, needs preview refresh
                 // (will be done once mouse enters preview win)
         void MakeDirty();
                 // current node updated, needs preview refresh
                 // (will be done once mouse enters preview win)

-      
+

         static PreviewFrame *Get();
         void ResetResource();
         static PreviewFrame *Get();
         void ResetResource();

-        
+

     private:
         void PreviewMenu();
         void PreviewToolbar();
         void PreviewPanel();
     private:
         void PreviewMenu();
         void PreviewToolbar();
         void PreviewPanel();

-    
+        void PreviewWXFrame();
+

     private:
         static PreviewFrame *ms_Instance;
         wxXmlNode *m_Node;
     private:
         static PreviewFrame *ms_Instance;
         wxXmlNode *m_Node;

-        wxString m_Version;
+        wxXmlDocument *m_Doc;

         wxScrolledWindow *m_ScrollWin;
         wxScrolledWindow *m_ScrollWin;

+#if wxUSE_LOG

         wxTextCtrl *m_LogCtrl;
         wxTextCtrl *m_LogCtrl;

+#endif // wxUSE_LOG

         wxSplitterWindow *m_Splitter;
         wxSplitterWindow *m_Splitter;

-        
+

         wxXmlResource *m_RC;
         wxString m_TmpFile;
         wxXmlResource *m_RC;
         wxString m_TmpFile;

-        
+

         bool m_Dirty;
         bool m_Dirty;

-        
+

         DECLARE_EVENT_TABLE()
         void OnMouseEnter(wxMouseEvent& event);
 };
         DECLARE_EVENT_TABLE()
         void OnMouseEnter(wxMouseEvent& event);
 };