Use the correct WXDLLEXPORT declaration.

[wxWidgets.git] / include / wx / os2 / combobox.h

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 4e3993699104289a81e4677b5c0f287bfe3c3a14..3eebbb45f4b7af12a40049ad94aaf64bbc1d4c7b 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -48,6 +48,29 @@ class WXDLLEXPORT wxComboBox : public wxChoice
               );
     }
 
               );
     }
 

+  inline wxComboBox( wxWindow*            pParent
+                    ,wxWindowID           vId
+                    ,const wxString&      rsValue
+                    ,const wxPoint&       rPos
+                    ,const wxSize&        rSize
+                    ,const wxArrayString& asChoices
+                    ,long                 lStyle = 0
+                    ,const wxValidator&   rValidator = wxDefaultValidator
+                    ,const wxString&      rsName = wxComboBoxNameStr
+                   )
+    {
+        Create( pParent
+               ,vId
+               ,rsValue
+               ,rPos
+               ,rSize
+               ,asChoices
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
+

     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
                 ,const wxString&    rsValue = wxEmptyString
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
                 ,const wxString&    rsValue = wxEmptyString


@@ -60,6 +83,17 @@ class WXDLLEXPORT wxComboBox : public wxChoice
                 ,const wxString&    rsName = wxComboBoxNameStr
                );
 
                 ,const wxString&    rsName = wxComboBoxNameStr
                );
 

+    bool Create( wxWindow*            pParent
+                ,wxWindowID           vId
+                ,const wxString&      rsValue
+                ,const wxPoint&       rPos
+                ,const wxSize&        rSize
+                ,const wxArrayString& asChoices
+                ,long                 lStyle = 0
+                ,const wxValidator&   rValidator = wxDefaultValidator
+                ,const wxString&      rsName = wxComboBoxNameStr
+               );
+

     //
     // List functions: see wxChoice
     //
     //
     // List functions: see wxChoice
     //


@@ -76,7 +110,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice
     virtual void        SetInsertionPoint(long lPos);
     virtual void        SetInsertionPointEnd(void);
     virtual long        GetInsertionPoint(void) const;
     virtual void        SetInsertionPoint(long lPos);
     virtual void        SetInsertionPointEnd(void);
     virtual long        GetInsertionPoint(void) const;

-    virtual long        GetLastPosition(void) const;
+    virtual wxTextPos   GetLastPosition(void) const;

     virtual void        Replace( long            lFrom
                                 ,long            lTo
                                 ,const wxString& rsValue
     virtual void        Replace( long            lFrom
                                 ,long            lTo
                                 ,const wxString& rsValue