fix warnings about hiding virtual wxGraphicsContext::DrawText() overloads by using...

[wxWidgets.git] / src / palmos / gauge.cpp

diff --git a/src/palmos/gauge.cpp b/src/palmos/gauge.cpp
index e8215b6847a8f8c9284768ee6a9be9f0fddcc584..fdc6df77f1f9f7cd4bcfc2478256a791b39a62b4 100644 (file)
--- a/src/palmos/gauge.cpp
+++ b/src/palmos/gauge.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/gauge.cpp
 // Purpose:     wxGauge class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/gauge.cpp
 // Purpose:     wxGauge class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "gauge.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,13 +24,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-

 #if wxUSE_GAUGE
 
 #include "wx/gauge.h"
 #if wxUSE_GAUGE
 
 #include "wx/gauge.h"

+
+#ifndef WX_PRECOMP
+#endif
+

 #include "wx/palmos/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/palmos/private.h"
 
 // ----------------------------------------------------------------------------


@@ -73,7 +69,7 @@ wxBEGIN_FLAGS( wxGaugeStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -94,7 +90,6 @@ wxBEGIN_FLAGS( wxGaugeStyle )
 
     wxFLAGS_MEMBER(wxGA_HORIZONTAL)
     wxFLAGS_MEMBER(wxGA_VERTICAL)
 
     wxFLAGS_MEMBER(wxGA_HORIZONTAL)
     wxFLAGS_MEMBER(wxGA_VERTICAL)

-    wxFLAGS_MEMBER(wxGA_PROGRESSBAR)

     wxFLAGS_MEMBER(wxGA_SMOOTH)
 
 wxEND_FLAGS( wxGaugeStyle )
     wxFLAGS_MEMBER(wxGA_SMOOTH)
 
 wxEND_FLAGS( wxGaugeStyle )


@@ -112,7 +107,7 @@ wxEND_PROPERTIES_TABLE()
 wxBEGIN_HANDLERS_TABLE(wxGauge)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxGauge)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_6( wxGauge , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_6( wxGauge , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )

 #else
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif


@@ -174,4 +169,3 @@ bool wxGauge::SetBackgroundColour(const wxColour& col)
 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE

-