sizeof(char) is 1. By definition.

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

diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 5f62b0af38e17982369feaa557ebcca3c51e6dbb..a8ae584b2332a02ac69177d131afbfe426081b0c 100644 (file)
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -10,28 +10,25 @@
 #ifndef __GTKMINIFRAMEH__
 #define __GTKMINIFRAMEH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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_CORE wxMiniFrame;
 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
@@ -42,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);
@@ -53,7 +50,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);
 
     virtual void SetTitle( const wxString &title );
@@ -62,6 +59,7 @@ public:
     bool   m_isDragging;
     int    m_oldX,m_oldY;
     int    m_diffX,m_diffY;
+    wxBitmap  m_closeButton;
 };
 
 #endif