Applied patch [ 1204548 ] Add Get and SetVolume to wxMediaCtrl and fix bug 1200182

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

diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp
index 585f8e6f680cccde126320e8baddc5ede878b906..3458da9f4b75934c722937e5952005c4e4046bc7 100644 (file)
--- a/src/common/gaugecmn.cpp
+++ b/src/common/gaugecmn.cpp
@@ -6,7 +6,7 @@
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

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


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

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

     #pragma implementation "gaugebase.h"
 #endif
 
     #pragma implementation "gaugebase.h"
 #endif
 


@@ -39,6 +39,11 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+wxGaugeBase::~wxGaugeBase()
+{
+    // this destructor is required for Darwin
+}
+

 // ----------------------------------------------------------------------------
 // wxGauge creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGauge creation
 // ----------------------------------------------------------------------------


@@ -53,7 +58,7 @@ bool wxGaugeBase::Create(wxWindow *parent,
                          const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
                          const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

 
     SetName(name);
 
 
     SetName(name);
 


@@ -64,7 +69,7 @@ bool wxGaugeBase::Create(wxWindow *parent,
     SetRange(range);
     SetValue(0);
 
     SetRange(range);
     SetValue(0);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------