1. fixed wxGTK notebook which was completely broken by the merge

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

diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h
index 9f1ebaa3454a8a65c6d0729368d288a39ce6f01c..f0edcd4b4d6ed320d839bd649b051332c3014c75 100644 (file)
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMINIFRAMEH__
@@ -15,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_MINIFRAME
+
 #include "wx/object.h"
 #include "wx/frame.h"
 
@@ -28,42 +31,39 @@ class wxMiniFrame;
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame: public wxFrame 
+class wxMiniFrame: public wxFrame
 {
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 public:
-  inline wxMiniFrame(void) {}
-  inline wxMiniFrame(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr)
-  {
-      Create(parent, id, title, pos, size, style, name);
-  }
-  bool Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr);
-          
-  // implementation       
-          
-  bool   m_isDragging;
-  int    m_oldX,m_oldY;
-  int    m_diffX,m_diffY;
-  
-  void DrawFrame( int x, int y );
-  void OnPaint( wxPaintEvent &event );
-  void OnMouse( wxMouseEvent &event );
+    wxMiniFrame() {}
+    wxMiniFrame(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            const wxString& name = wxFrameNameStr)
+    {
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            const wxString& name = wxFrameNameStr);
 
-  DECLARE_EVENT_TABLE()
+ // implementation
+ 
+    bool   m_isDragging;
+    int    m_oldX,m_oldY;
+    int    m_diffX,m_diffY;
 };
 
+#endif
+
 #endif
   //  __GTKMINIFRAMEH__