replace changes of r49890 by defining more compatibility operators in wxCmdLineArgsAr...

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

diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 1828439281b67d0c050750ebc9bdf129e2743f95..0a5d6107b6b68893646071e1288e1ff067b53d57 100644 (file)
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -7,28 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKMINIFRAMEH__
-#define __GTKMINIFRAMEH__
+#ifndef _WX_GTK_MINIFRAME_H_
+#define _WX_GTK_MINIFRAME_H_

 
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
+#include "wx/bitmap.h"

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

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMiniFrame;
-

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

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

 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 {
     DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 


@@ -39,7 +28,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);


@@ -50,15 +39,22 @@ 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 );
+
+protected:
+    virtual void DoGetClientSize(int* width, int* height) const;
+

  // implementation
  // implementation

- 
+public:

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

+    wxBitmap  m_closeButton;
+    int m_miniEdge;
+    int m_miniTitle;

 };
 
 };
 

-#endif
-  //  __GTKMINIFRAMEH__
+#endif // _WX_GTK_MINIFRAME_H_