Switched to DECLARE_NO_COPY_CLASS

[wxWidgets.git] / include / wx / frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index aaec9eba9532acf11dcb47e251ac6adb7a3f4465..ac7e48f61c5036e0cadbd20df82c25fb197dfa87 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -54,9 +54,7 @@ class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
 public:
     // construction
     wxFrameBase();
 public:
     // construction
     wxFrameBase();

-#ifdef __DARWIN__
-    virtual ~wxFrameBase() { }
-#endif
+    virtual ~wxFrameBase();

 
     wxFrame *New(wxWindow *parent,
                  wxWindowID id,
 
     wxFrame *New(wxWindow *parent,
                  wxWindowID id,


@@ -203,7 +201,7 @@ protected:
 };
 
 // include the real class declaration
 };
 
 // include the real class declaration

-#ifdef __WXUNIVERSAL__
+#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)

     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__
     #if defined(__WXMSW__)
     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__
     #if defined(__WXMSW__)