fixing non-precomp builds

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

diff --git a/interface/wx/bmpcbox.h b/interface/wx/bmpcbox.h
index f74407e000f9791310905e9ec161c1e6aa513cc1..60bb9c842ac0d9f571f885b51b21df9318d46c30 100644 (file)
--- a/interface/wx/bmpcbox.h
+++ b/interface/wx/bmpcbox.h
@@ -36,7 +36,7 @@
 
     @todo create wxCB_PROCESS_ENTER rather than reusing wxTE_PROCESS_ENTER!
 
 
     @todo create wxCB_PROCESS_ENTER rather than reusing wxTE_PROCESS_ENTER!
 

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

     @event{EVT_COMBOBOX(id, func)}
            Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
            the list is selected.
     @event{EVT_COMBOBOX(id, func)}
            Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
            the list is selected.


@@ -49,7 +49,7 @@
 
     @library{wxadv}
     @category{ctrl}
 
     @library{wxadv}
     @category{ctrl}

-    <!-- @appearance{bitmapcombobox.png} -->
+    @appearance{bitmapcombobox.png}

 
     @see wxComboBox, wxChoice, wxOwnerDrawnComboBox, wxCommandEvent
 */
 
     @see wxComboBox, wxChoice, wxOwnerDrawnComboBox, wxCommandEvent
 */


@@ -180,7 +180,8 @@ public:
                 const wxString& name = wxBitmapComboBoxNameStr);
 
     /**
                 const wxString& name = wxBitmapComboBoxNameStr);
 
     /**

-        Returns size of bitmaps used in the list.
+        Returns the size of the bitmaps used in the combo box.
+        If the combo box is empty, then ::wxDefaultSize is returned.

     */
     virtual wxSize GetBitmapSize() const;
 
     */
     virtual wxSize GetBitmapSize() const;