Triued in vain to fix threads segvs with gcc

[wxWidgets.git] / include / wx / tbarsmpl.h

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index d1ebf8aecaec710e9bc4fdcebd21831b81b12a1b..2e4911aee15c2c29218361d35c3c4f6569d0a35c 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TBARSMPLH__
-#define __TBARSMPLH__
+#ifndef _WX_TBARSMPLH__
+#define _WX_TBARSMPLH__
 
 #ifdef __GNUG__
 #pragma interface "tbarsmpl.h"
@@ -18,12 +18,14 @@
 
 #include "wx/defs.h"
 
-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR
 
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/tbarbase.h"
 
+class WXDLLEXPORT wxMemoryDC;
+
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
@@ -37,24 +39,16 @@ class WXDLLEXPORT wxToolBarSimple : public wxToolBarBase
  public:
 
   wxToolBarSimple(void);
-#if WXWIN_COMPATIBILITY > 0
-  inline wxToolBarSimple(wxWindow *parent, int x, int y, int w, int h,
-            long style = wxNO_BORDER, int orientation = wxVERTICAL, int RowsOrColumns = 1,
-            const char *name = wxToolBarNameStr)
-  {
-    Create(parent, -1, wxPoint(x, y), wxSize(w, h), style, orientation, RowsOrColumns, name);
-  }
-#endif
-  inline wxToolBarSimple(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
-            const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr)
+  inline wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+            long style = wxNO_BORDER|wxTB_HORIZONTAL,
+            const wxString& name = wxToolBarNameStr)
   {
-    Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
+    Create(parent, id, pos, size, style, name);
   }
   ~wxToolBarSimple(void);
 
-  bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            const long style = wxNO_BORDER, const int orientation = wxVERTICAL, const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
+  bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+            long style = wxNO_BORDER|wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr);
 
   void OnPaint(wxPaintEvent& event);
   void OnSize(wxSizeEvent& event);
@@ -64,14 +58,24 @@ class WXDLLEXPORT wxToolBarSimple : public wxToolBarBase
   // Handle wxToolBar events
 
   virtual void DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool);
-  virtual void ToggleTool(const int toolIndex, const bool toggle); // toggle is TRUE if toggled on
+  virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
+
+  virtual void SpringUpButton(int index);
+
+  void Layout(void);
+
+  // The post-tool-addition call
+  bool Realize() { Layout(); return TRUE; };
+
+protected:
+  int                   m_currentRowsOrColumns;
+  long                  m_lastX, m_lastY;
 
-  virtual void SpringUpButton(const int index);
+DECLARE_EVENT_TABLE()
 
-  DECLARE_EVENT_TABLE()
 };
 
-#endif // USE_TOOLBAR
+#endif // wxUSE_TOOLBAR
 #endif
-    // __TBARSMPLH__
+    // _WX_TBARSMPLH__