make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 1828439281b67d0c050750ebc9bdf129e2743f95..7d925b40a3af862bb861ca4caaa6f0f0749d665a 100644 (file)
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -10,25 +10,25 @@
 #ifndef __GTKMINIFRAMEH__
 #define __GTKMINIFRAMEH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
+
+#if wxUSE_MINIFRAME
+
 #include "wx/object.h"
+#include "wx/bitmap.h"
 #include "wx/frame.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame;
+class WXDLLIMPEXP_FWD_CORE wxMiniFrame;
 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
@@ -39,7 +39,7 @@ public:
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            long style = wxCAPTION | wxRESIZE_BORDER,
             const wxString& name = wxFrameNameStr)
     {
         Create(parent, id, title, pos, size, style, name);
@@ -50,15 +50,19 @@ public:
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            long style = wxCAPTION | wxRESIZE_BORDER,
             const wxString& name = wxFrameNameStr);
 
+    virtual void SetTitle( const wxString &title );
  // implementation
  
     bool   m_isDragging;
     int    m_oldX,m_oldY;
     int    m_diffX,m_diffY;
+    wxBitmap  m_closeButton;
 };
 
+#endif
+
 #endif
   //  __GTKMINIFRAMEH__