Add missing styles and flags, and specify pure virtuals that are implemented

[wxWidgets.git] / src / generic / filepickerg.cpp

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index f8d7a827c3e26fdf5dc66ab159cf7f8cdb55a25a..2b1c6d271d2e86bfb4d36354cc8934459ddc3b8b 100644 (file)
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -48,12 +48,30 @@ bool wxGenericFileDirButton::Create(wxWindow *parent,
                                     const wxString& wildcard,
                                     const wxPoint& pos,
                                     const wxSize& size,
                                     const wxString& wildcard,
                                     const wxPoint& pos,
                                     const wxSize& size,

-                                    long WXUNUSED(style),
+                                    long style,

                                     const wxValidator& validator,
                                     const wxString& name)
 {
                                     const wxValidator& validator,
                                     const wxString& name)
 {

+    m_pickerStyle = style;
+
+    // If the special wxPB_SMALL flag is used, ignore the provided label and
+    // use the shortest possible label and the smallest possible button fitting
+    // it.
+    long styleButton = 0;
+    wxString labelButton;
+    if ( m_pickerStyle & wxPB_SMALL )
+    {
+        labelButton = _("...");
+        styleButton = wxBU_EXACTFIT;
+    }
+    else
+    {
+        labelButton = label;
+    }
+

     // create this button
     // create this button

-    if ( !wxButton::Create(parent, id, label, pos, size, 0, validator, name) )
+    if ( !wxButton::Create(parent, id, labelButton,
+                           pos, size, styleButton, validator, name) )

     {
         wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
         return false;
     {
         wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
         return false;