make OSX defines to be 1, not only defined, for backwards compatibility reasons

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

diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index a8ae584b2332a02ac69177d131afbfe426081b0c..7cda4e321640bd4c6f73bff563095443fe6b0b74 100644 (file)
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -7,23 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

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

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

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

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


@@ -54,15 +43,21 @@ public:
             const wxString& name = wxFrameNameStr);
 
     virtual void SetTitle( const wxString &title );
             const wxString& name = wxFrameNameStr);
 
     virtual void SetTitle( const wxString &title );

+
+protected:
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW, int maxH,
+                                 int incW, int incH );
+    virtual void DoGetClientSize(int* width, int* height) const;
+

  // implementation
  // implementation

- 
+public:

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

+    int m_miniEdge;
+    int m_miniTitle;

 };
 
 };
 

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