applied patch #931719: "ESC closes dialog instead of combobox dropdown" (closes patch...

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

diff --git a/include/wx/mac/minifram.h b/include/wx/mac/minifram.h
index 6f606cd82fd4643266040d026effcc586e78c0af..d521ebcc66664aa991004bdac4385318be2ce156 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:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MINIFRAM_H_
-#define _WX_MINIFRAM_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "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 | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name);
-  }
-
-  ~wxMiniFrame() {}
-protected:
-};
-
-#endif
-    // _WX_MINIFRAM_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/minifram.h"
+#else
+#include "wx/mac/carbon/minifram.h"
+#endif
\ No newline at end of file