More interface header reviews by Azriel Fasten, and added skeleton docs for wxBookCtr...

[wxWidgets.git] / interface / bmpcbox.h

diff --git a/interface/bmpcbox.h b/interface/bmpcbox.h
index 0ac05f1ba41d10611c61fb377185c15863c260bd..765058513b1768eaa67347456a9a73e243908ca3 100644 (file)
--- a/interface/bmpcbox.h
+++ b/interface/bmpcbox.h
@@ -22,12 +22,12 @@
     @c wxGENERIC_BITMAPCOMBOBOX is defined.
 
     @beginStyleTable
     @c wxGENERIC_BITMAPCOMBOBOX is defined.
 
     @beginStyleTable

-    @style{wxCB_READONLY}:
+    @style{wxCB_READONLY}

            Creates a combobox without a text editor. On some platforms the
            control may appear very different when this style is used.
            Creates a combobox without a text editor. On some platforms the
            control may appear very different when this style is used.

-    @style{wxCB_SORT}:
+    @style{wxCB_SORT}

            Sorts the entries in the list alphabetically.
            Sorts the entries in the list alphabetically.

-    @style{wxTE_PROCESS_ENTER}:
+    @style{wxTE_PROCESS_ENTER}

            The control will generate the event wxEVT_COMMAND_TEXT_ENTER
            (otherwise pressing Enter key is either processed internally by the
            control or used for navigation between dialog controls).
            The control will generate the event wxEVT_COMMAND_TEXT_ENTER
            (otherwise pressing Enter key is either processed internally by the
            control or used for navigation between dialog controls).


@@ -36,20 +36,20 @@
 
     @todo create wxCB_PROCESS_ENTER rather than reusing wxTE_PROCESS_ENTER!
 
 
     @todo create wxCB_PROCESS_ENTER rather than reusing wxTE_PROCESS_ENTER!
 

-    @beginEventTable
-    @event{EVT_COMBOBOX(id, func)}:
+    @beginEventTable{wxCommandEvent}
+    @event{EVT_COMBOBOX(id, func)}

            Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
            the list is selected.
            Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
            the list is selected.

-    @event{EVT_TEXT(id, func)}:
+    @event{EVT_TEXT(id, func)}

            Process a wxEVT_COMMAND_TEXT_UPDATED event, when the combobox text changes.
            Process a wxEVT_COMMAND_TEXT_UPDATED event, when the combobox text changes.

-    @event{EVT_TEXT_ENTER(id, func)}:
+    @event{EVT_TEXT_ENTER(id, func)}

            Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
            the combobox.
     @endEventTable
 
     @library{wxadv}
     @category{ctrl}
            Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
            the combobox.
     @endEventTable
 
     @library{wxadv}
     @category{ctrl}

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

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


@@ -111,7 +111,7 @@ public:
     /**
         Destructor, destroying the combobox.
     */
     /**
         Destructor, destroying the combobox.
     */

-    ~wxBitmapComboBox();
+    virtual ~wxBitmapComboBox();

 
     /**
         Adds the item to the end of the combo box.
 
     /**
         Adds the item to the end of the combo box.


@@ -157,12 +157,12 @@ public:
     /**
         Returns size of bitmaps used in the list.
     */
     /**
         Returns size of bitmaps used in the list.
     */

-    wxSize GetBitmapSize() const;
+    virtual wxSize GetBitmapSize() const;

 
     /**
         Returns the bitmap of the item with the given index.
     */
 
     /**
         Returns the bitmap of the item with the given index.
     */

-    wxBitmap GetItemBitmap(unsigned int n) const;
+    virtual wxBitmap GetItemBitmap(unsigned int n) const;

 
     /**
         Inserts the item into the list before @a pos.
 
     /**
         Inserts the item into the list before @a pos.


@@ -189,6 +189,6 @@ public:
     /**
         Sets the bitmap for the given item.
     */
     /**
         Sets the bitmap for the given item.
     */

-    void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);
+    virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);

 };
 
 };