Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index e1b894b63c44e9bce2de7c8e7888b923c0c7bb2c..e53b1640ab1e7f78507762fa38e824969044967c 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

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

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dialogbase.h"
 #endif
 
     #pragma implementation "dialogbase.h"
 #endif
 


@@ -67,7 +67,7 @@ void wxDialogBase::Init()
 #endif
 }
 
 #endif
 }
 

-#if wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL

 
 wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 {
 
 wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 {


@@ -164,7 +164,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
     return box;
 }
 
     return box;
 }
 

-#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL

 
 #if wxUSE_BUTTON
 
 
 #if wxUSE_BUTTON
 


@@ -172,14 +172,9 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 {
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
     
 {
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
     

-    wxBoxSizer *box = NULL;
-    

     // If we have a PDA screen, put yes/no button over 
     // all other buttons, otherwise on the left side.
     // If we have a PDA screen, put yes/no button over 
     // all other buttons, otherwise on the left side.

-    if (is_pda)
-        box = new wxBoxSizer( wxVERTICAL );
-    else
-        box = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer *box = is_pda ? new wxBoxSizer( wxVERTICAL ) : new wxBoxSizer( wxHORIZONTAL );

         
     wxBoxSizer *inner_yes_no = NULL;
     
         
     wxBoxSizer *inner_yes_no = NULL;