wxHTML src code indentation now conforms (more) to wxWin coding style

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 288f2d3a64806f9022fb69281b7d7351ad538749..7abcc57a46f4120fdc2ba99c2deac41a1c86c3c4 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -142,7 +142,7 @@ public:
     {
         if ( m_toolStyle == wxTOOL_STYLE_CONTROL )
         {
     {
         if ( m_toolStyle == wxTOOL_STYLE_CONTROL )
         {

-            return m_control->GetClientData();
+            return (wxObject*)m_control->GetClientData();

         }
         else
         {
         }
         else
         {


@@ -206,7 +206,7 @@ protected:
 };
 
 // a list of toolbar tools
 };
 
 // a list of toolbar tools

-WX_DECLARE_LIST(wxToolBarToolBase, wxToolBarToolsList);
+WX_DECLARE_EXPORTED_LIST(wxToolBarToolBase, wxToolBarToolsList);

 
 // ----------------------------------------------------------------------------
 // the base class for all toolbars
 
 // ----------------------------------------------------------------------------
 // the base class for all toolbars


@@ -221,6 +221,16 @@ public:
     // toolbar construction
     // --------------------
 
     // toolbar construction
     // --------------------
 

+    // the most commonly used version of AddTool()
+    wxToolBarToolBase *AddTool(int id,
+                               const wxBitmap& bitmap,
+                               const wxString& shortHelpString = wxEmptyString,
+                               const wxString& longHelpString = wxEmptyString)
+    {
+        return AddTool(id, bitmap, wxNullBitmap, FALSE, NULL,
+                       shortHelpString, longHelpString);
+    }
+

     // If pushedBitmap is NULL, a reversed version of bitmap is created and
     // used as the pushed/toggled image. If toggle is TRUE, the button toggles
     // between the two states.
     // If pushedBitmap is NULL, a reversed version of bitmap is created and
     // used as the pushed/toggled image. If toggle is TRUE, the button toggles
     // between the two states.


@@ -397,6 +407,9 @@ public:
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 

+    // Don't want toolbars to accept the focus
+    bool AcceptsFocus() const { return FALSE; }
+

 protected:
     // to implement in derived classes
     // -------------------------------
 protected:
     // to implement in derived classes
     // -------------------------------


@@ -454,6 +467,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_CLASS(wxToolBarBase)

 };
 
 #endif
 };
 
 #endif