Use mask when drawing bitmaps in generic wxDataViewCtrl.

[wxWidgets.git] / src / osx / cocoa / preferences.mm

diff --git a/src/osx/cocoa/preferences.mm b/src/osx/cocoa/preferences.mm
index 81160c7b3e4d3be0e8456ac4e743342b96b2a8c4..7b51732bf0ab39276344bdc79ba4c8d1d3dd6361 100644 (file)
--- a/src/osx/cocoa/preferences.mm
+++ b/src/osx/cocoa/preferences.mm
@@ -3,7 +3,6 @@
 // Purpose:     Native OS X implementation of wxPreferencesEditor.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
-// RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -23,6 +22,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_PREFERENCES_EDITOR
+
 #include "wx/private/preferences.h"
 
 #ifdef wxHAS_PREF_EDITOR_NATIVE
@@ -129,6 +130,7 @@ private:
         {
             info->win = info->page->CreateWindow(this);
             info->win->Hide();
+            info->win->Fit();
             // fill the page with data using wxEVT_INIT_DIALOG/TransferDataToWindow:
             info->win->InitDialog();
         }
@@ -255,3 +257,5 @@ wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create(const wxString& title)
 }
 
 #endif // wxHAS_PREF_EDITOR_NATIVE
+
+#endif // wxUSE_PREFERENCES_EDITOR