Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

[wxWidgets.git] / src / palmos / toolbar.cpp

diff --git a/src/palmos/toolbar.cpp b/src/palmos/toolbar.cpp
index b3ee1228d45475a705cde830640bea4ce8e76698..166d36c8331c9b987cac3caa502a1b19374762db 100644 (file)
--- a/src/palmos/toolbar.cpp
+++ b/src/palmos/toolbar.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "toolbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,28 +24,28 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
+
+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/dynarray.h"

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

-    #include "wx/dynarray.h"

     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"

+    #include "wx/app.h"         // for GetComCtl32Version

 #endif
 
 #endif
 

-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
-
-#include "wx/toolbar.h"

 #include "wx/sysopt.h"
 
 #include "wx/palmos/private.h"
 
 #include "wx/palmos/wrapcctl.h"
 
 #include "wx/sysopt.h"
 
 #include "wx/palmos/private.h"
 
 #include "wx/palmos/wrapcctl.h"
 

-#include "wx/app.h"         // for GetComCtl32Version
-

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------


@@ -93,7 +89,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)

-    EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)

 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------


@@ -117,8 +112,8 @@ public:
     {
     }
 
     {
     }
 

-    wxToolBarTool(wxToolBar *tbar, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)

     {
     }
 
     {
     }
 


@@ -134,7 +129,7 @@ public:
 private:
     size_t m_nSepCount;
 
 private:
     size_t m_nSepCount;
 

-    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarTool);

 };
 
 
 };
 
 


@@ -159,9 +154,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
                              clientData, shortHelp, longHelp);
 }
 
                              clientData, shortHelp, longHelp);
 }
 

-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)

 {
 {

-    return new wxToolBarTool(this, control);
+    return new wxToolBarTool(this, control, label);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -248,14 +244,6 @@ void wxToolBar::UpdateSize()
 {
 }
 
 {
 }
 

-// ----------------------------------------------------------------------------
-// toolbar styles
-// ---------------------------------------------------------------------------
-
-void wxToolBar::SetWindowStyleFlag(long style)
-{
-}
-

 // ----------------------------------------------------------------------------
 // tool state
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // tool state
 // ----------------------------------------------------------------------------


@@ -276,14 +264,8 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
 // event handlers
 // ----------------------------------------------------------------------------
 
 // event handlers
 // ----------------------------------------------------------------------------
 

-// Responds to colour changes, and passes event on to children.
-void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-}
-

 void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 {
 }
 
 #endif // wxUSE_TOOLBAR
 void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 {
 }
 
 #endif // wxUSE_TOOLBAR

-