Make all instances of HasEditorCtrl() const, not just a few

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

diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h
index 3b6a719f0a554194b0432f40a09cb256aeeeae24..ba00ddd1a40de20d1d63f7b67210ef46cc38af2a 100644 (file)
--- a/include/wx/osx/minifram.h
+++ b/include/wx/osx/minifram.h
@@ -1,5 +1,42 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/minifram.h"
-#else
-#include "wx/osx/carbon/minifram.h"
+/////////////////////////////////////////////////////////////////////////////
+// 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_
+
+#include "wx/frame.h"
+
+class WXDLLIMPEXP_CORE 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 = wxCAPTION | wxRESIZE_BORDER | 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);
+  }
+
+  virtual ~wxMiniFrame() {}
+protected:
+};
+
 #endif
+    // _WX_MINIFRAM_H_