Apply parts of patch #1719888 to fix compilation on Mac and with

[wxWidgets.git] / include / wx / mac / minifram.h

diff --git a/include/wx/mac/minifram.h b/include/wx/mac/minifram.h
index 8f1644d5583ac7dc529ca482d60fa0b94bb0b1eb..d0035febbaba324be44f7a2c2cb9cd497cf023f8 100644 (file)
--- a/include/wx/mac/minifram.h
+++ b/include/wx/mac/minifram.h
@@ -1,46 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        minifram.h
-// Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
-//              If there is no equivalent on your platform, just make it a
-//              normal frame.
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MINIFRAM_H_
-#define _WX_MINIFRAM_H_
-
-#ifdef __GNUG__
-#pragma interface "minifram.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/minifram.h"
+#else
+#include "wx/mac/carbon/minifram.h"
 #endif
-
-#include "wx/frame.h"
-
-class WXDLLEXPORT wxMiniFrame: public wxFrame {
-
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-
-public:
-  inline wxMiniFrame() {}
-  inline wxMiniFrame(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr)
-  {
-      // Use wxFrame constructor in absence of more specific code.
-      Create(parent, id, title, pos, size, style, name);
-  }
-
-  ~wxMiniFrame() {}
-protected:
-};
-
-#endif
-    // _WX_MINIFRAM_H_