converted to 16 colors

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 3cf75abf8ba9061202c6a8c6ba021fb3d44606d0..48f37f7e08c8c2b7f78938c67e0d5861836150b0 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -23,7 +23,7 @@
 #include "wx/list.h"
 #include "wx/control.h"
 
 #include "wx/list.h"
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;

 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
 
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
 


@@ -44,7 +44,7 @@ class WXDLLEXPORT wxToolBarTool: public wxObject
                 int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
                 bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
                 const wxString& shortHelpString = "", const wxString& longHelpString = "",
                 int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
                 bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
                 const wxString& shortHelpString = "", const wxString& longHelpString = "",

-                GtkWidget *item = (GtkWidget *) NULL );
+                GtkWidget *pixmap = (GtkWidget *) NULL );

 #else
   wxToolBarTool(int theIndex, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
                 bool toggle = FALSE, long xPos = -1, long yPos = -1,
 #else
   wxToolBarTool(int theIndex, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
                 bool toggle = FALSE, long xPos = -1, long yPos = -1,


@@ -75,6 +75,7 @@ public:
 #ifdef __WXGTK__
   wxToolBar            *m_owner;
   GtkWidget            *m_item;
 #ifdef __WXGTK__
   wxToolBar            *m_owner;
   GtkWidget            *m_item;

+  GtkWidget            *m_pixmap;

 #endif
 };
 
 #endif
 };
 


@@ -158,7 +159,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
 #endif
 
   // Lay the tools out
 #endif
 
   // Lay the tools out

-  virtual void Layout(void);
+  virtual void LayoutTools();

   
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void) { return TRUE; }
   
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void) { return TRUE; }


@@ -208,11 +209,6 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
   void OnSize(wxSizeEvent& event);
   void OnIdle(wxIdleEvent& event);
 
   void OnSize(wxSizeEvent& event);
   void OnIdle(wxIdleEvent& event);
 

-  // Required to force normal cursor-setting behaviour in Windows
-#ifdef __WXMSW__
-  virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
-#endif
-

  protected:
   wxList                m_tools;
 //  int                   m_tilingDirection;
  protected:
   wxList                m_tools;
 //  int                   m_tilingDirection;