Add an underscore before the generated output names.

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index fc09d4658610474b90a14229396f099242e2f61f..cc367e41bb69f6a5ae65e4201aa047793ba1d666 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -361,6 +361,9 @@ public:
 
     // must be called after all buttons have been created to finish toolbar
     // initialisation
 
     // must be called after all buttons have been created to finish toolbar
     // initialisation

+    //
+    // derived class versions should call the base one first, before doing
+    // platform-specific stuff

     virtual bool Realize();
 
     // tools state
     virtual bool Realize();
 
     // tools state


@@ -602,6 +605,10 @@ protected:
     // un-toggle all buttons in the same radio group
     void UnToggleRadioGroup(wxToolBarToolBase *tool);
 
     // un-toggle all buttons in the same radio group
     void UnToggleRadioGroup(wxToolBarToolBase *tool);
 

+    // make the size of the buttons big enough to fit the largest bitmap size
+    void AdjustToolBitmapSize();
+
+

     // the list of all our tools
     wxToolBarToolsList m_tools;
 
     // the list of all our tools
     wxToolBarToolsList m_tools;
 


@@ -622,7 +629,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxToolBarBase)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarBase);

 };
 
 // deprecated function for creating the image for disabled buttons, use
 };
 
 // deprecated function for creating the image for disabled buttons, use