declare wxVector<wxXmlResourceHandler *> as DLL-exported to avoid VC++ warnings in...

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

diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index bedee8e0270e3c2d1910419f200bc97143d3e261..7d925b40a3af862bb861ca4caaa6f0f0749d665a 100644 (file)
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -10,28 +10,25 @@
 #ifndef __GTKMINIFRAMEH__
 #define __GTKMINIFRAMEH__
 
 #ifndef __GTKMINIFRAMEH__
 #define __GTKMINIFRAMEH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_MINIFRAME
 
 #include "wx/object.h"
 #include "wx/defs.h"
 
 #if wxUSE_MINIFRAME
 
 #include "wx/object.h"

+#include "wx/bitmap.h"

 #include "wx/frame.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 #include "wx/frame.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxMiniFrame;
+class WXDLLIMPEXP_FWD_CORE wxMiniFrame;

 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 

-class wxMiniFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame

 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 


@@ -42,7 +39,7 @@ public:
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             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);
             const wxString& name = wxFrameNameStr)
     {
         Create(parent, id, title, pos, size, style, name);


@@ -53,14 +50,16 @@ public:
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             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);
 
             const wxString& name = wxFrameNameStr);
 

+    virtual void SetTitle( const wxString &title );

  // implementation
  
     bool   m_isDragging;
     int    m_oldX,m_oldY;
     int    m_diffX,m_diffY;
  // implementation
  
     bool   m_isDragging;
     int    m_oldX,m_oldY;
     int    m_diffX,m_diffY;

+    wxBitmap  m_closeButton;

 };
 
 #endif
 };
 
 #endif