Correct decoding of 4-byte integers in png2c script.

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

diff --git a/interface/wx/bmpcbox.h b/interface/wx/bmpcbox.h
index c5ba7aa7ff832a321646232bfe6d1923c18a31e8..509ff6b5226912b6a6ea0501a68102ab166df077 100644 (file)
--- a/interface/wx/bmpcbox.h
+++ b/interface/wx/bmpcbox.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxBitmapComboBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxBitmapComboBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

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


@@ -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{wxCommandEvent}
+    @beginEventEmissionTable{wxCommandEvent}

     @event{EVT_COMBOBOX(id, func)}
     @event{EVT_COMBOBOX(id, func)}

-           Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
+           Process a @c wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on

            the list is selected.
     @event{EVT_TEXT(id, func)}
            the list is selected.
     @event{EVT_TEXT(id, func)}

-           Process a wxEVT_COMMAND_TEXT_UPDATED event, when the combobox text changes.
+           Process a @c 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
+           Process a @c wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in

            the combobox.
     @endEventTable
 
     @library{wxadv}
     @category{ctrl}
            the combobox.
     @endEventTable
 
     @library{wxadv}
     @category{ctrl}

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

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


@@ -70,10 +70,20 @@ public:
             Window identifier. The value wxID_ANY indicates a default value.
         @param value
             Initial selection string. An empty string indicates no selection.
             Window identifier. The value wxID_ANY indicates a default value.
         @param value
             Initial selection string. An empty string indicates no selection.

+        @param pos
+            Initial position.
+        @param size
+            Initial size.

         @param n
             Number of strings with which to initialise the control.
         @param choices
             An array of strings with which to initialise the control.
         @param n
             Number of strings with which to initialise the control.
         @param choices
             An array of strings with which to initialise the control.

+        @param style
+            The window style, see wxCB_* flags.
+        @param validator
+            Validator which can be used for additional data checks.
+        @param name
+            Control name.

 
         @see Create(), wxValidator
     */
 
         @see Create(), wxValidator
     */


@@ -96,8 +106,18 @@ public:
             Window identifier. The value wxID_ANY indicates a default value.
         @param value
             Initial selection string. An empty string indicates no selection.
             Window identifier. The value wxID_ANY indicates a default value.
         @param value
             Initial selection string. An empty string indicates no selection.

+        @param pos
+            Initial position.
+        @param size
+            Initial size.

         @param choices
             An wxArrayString with which to initialise the control.
         @param choices
             An wxArrayString with which to initialise the control.

+        @param style
+            The window style, see wxCB_* flags.
+        @param validator
+            Validator which can be used for additional data checks.
+        @param name
+            Control name.

 
         @see Create(), wxValidator
     */
 
         @see Create(), wxValidator
     */


@@ -160,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;