undo the last change as it results in buildbot configuration error

[wxWidgets.git] / interface / wx / bmpbuttn.h

diff --git a/interface/wx/bmpbuttn.h b/interface/wx/bmpbuttn.h
index 76847b6bd70fbd2e9592cfb3624d65cfb688bb8a..ba624b712186565c1751513369bfb082818f7294 100644 (file)
--- a/interface/wx/bmpbuttn.h
+++ b/interface/wx/bmpbuttn.h
@@ -18,9 +18,9 @@
     additional bitmaps for the selected state, unpressed focused state, and greyed-out
     state may be supplied.
 
     additional bitmaps for the selected state, unpressed focused state, and greyed-out
     state may be supplied.
 

-    @section wxbitmapbutton_states Button states
-    This class supports bitmaps for several different states:
+    @section bitmapbutton_states Button states

 
 

+    This class supports bitmaps for several different states:

     @li @b normal: this is the bitmap shown in the default state, it must be always
         valid while all the other bitmaps are optional and don't have to be set.
     @li @b disabled: bitmap shown when the button is disabled.
     @li @b normal: this is the bitmap shown in the default state, it must be always
         valid while all the other bitmaps are optional and don't have to be set.
     @li @b disabled: bitmap shown when the button is disabled.


@@ -54,7 +54,7 @@
     Note that the wxBU_EXACTFIT style supported by wxButton is not used by this
     class as bitmap buttons don't have any minimal standard size by default.
 
     Note that the wxBU_EXACTFIT style supported by wxButton is not used by this
     class as bitmap buttons don't have any minimal standard size by default.
 

-    @beginEventTable{wxCommandEvent}
+    @beginEventEmissionTable{wxCommandEvent}

     @event{EVT_BUTTON(id, func)}
            Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.
     @endEventTable
     @event{EVT_BUTTON(id, func)}
            Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.
     @endEventTable


@@ -84,9 +84,11 @@ public:
             Bitmap to be displayed.
         @param pos
             Button position.
             Bitmap to be displayed.
         @param pos
             Button position.

+            If ::wxDefaultPosition is specified then a default position is chosen.

         @param size
         @param size

-            Button size. If wxDefaultSize is specified then the button is sized
-            appropriately for the bitmap.
+            Button size. 
+            If ::wxDefaultSize is specified then the button is sized appropriately 
+            for the bitmap.

         @param style
             Window style. See wxBitmapButton.
         @param validator
         @param style
             Window style. See wxBitmapButton.
         @param validator


@@ -147,7 +149,7 @@ public:
         @see SetBitmapFocus()
     */
     const wxBitmap& GetBitmapFocus() const;
         @see SetBitmapFocus()
     */
     const wxBitmap& GetBitmapFocus() const;

-    wxBitmap&  GetBitmapFocus();
+    wxBitmap& GetBitmapFocus();

     //@}
 
     //@{
     //@}
 
     //@{


@@ -156,8 +158,8 @@ public:
 
         @see SetBitmapHover()
     */
 
         @see SetBitmapHover()
     */

-    const wxBitmap& GetBitmapHover();
-    wxBitmap&  GetBitmapHover();
+    const wxBitmap& GetBitmapHover() const;
+    wxBitmap& GetBitmapHover();

     //@}
 
     //@{
     //@}
 
     //@{


@@ -168,8 +170,8 @@ public:
 
         @see SetBitmapLabel()
     */
 
         @see SetBitmapLabel()
     */

-    const wxBitmap& GetBitmapLabel();
-    wxBitmap&  GetBitmapLabel();
+    const wxBitmap& GetBitmapLabel() const;
+    wxBitmap& GetBitmapLabel();

     //@}
 
     /**
     //@}
 
     /**