Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/bmpbuttn.h b/interface/wx/bmpbuttn.h
index 1d352d856a6a1f19cc33f5bdc271fc2fea688df1..6af9eed0a956b4628f4f389dce5a500c02515854 100644 (file)
--- a/interface/wx/bmpbuttn.h
+++ b/interface/wx/bmpbuttn.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxBitmapButton
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxBitmapButton
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -18,21 +18,14 @@
     support in wxButton.
 
     @beginStyleTable
     support in wxButton.
 
     @beginStyleTable

-    @style{wxBU_AUTODRAW}
-           If this is specified, the button will be drawn automatically using
-           the label bitmap only, providing a 3D-look border. If this style is
-           not specified, the button will be drawn without borders and using
-           all provided bitmaps. Has effect only under MS Windows.

     @style{wxBU_LEFT}
     @style{wxBU_LEFT}

-           Left-justifies the bitmap label. Has effect only under MS Windows.
+           Left-justifies the bitmap label.

     @style{wxBU_TOP}
            Aligns the bitmap label to the top of the button.
     @style{wxBU_TOP}
            Aligns the bitmap label to the top of the button.

-           Has effect only under MS Windows.

     @style{wxBU_RIGHT}
     @style{wxBU_RIGHT}

-           Right-justifies the bitmap label. Has effect only under MS Windows.
+           Right-justifies the bitmap label.

     @style{wxBU_BOTTOM}
            Aligns the bitmap label to the bottom of the button.
     @style{wxBU_BOTTOM}
            Aligns the bitmap label to the bottom of the button.

-           Has effect only under MS Windows.

     @endStyleTable
 
     Note that the wxBU_EXACTFIT style supported by wxButton is not used by this
     @endStyleTable
 
     Note that the wxBU_EXACTFIT style supported by wxButton is not used by this


@@ -40,7 +33,7 @@
 
     @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_BUTTON(id, func)}
 
     @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_BUTTON(id, func)}

-           Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.
+           Process a @c wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}