[ 1556353 ] [wxOS2] Change derivation to add wxGauge::Pulse

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index 9b8f2dca23347300afeb271d78a24129bab03aaa..5df97b19ae5e5b8ddbfe7e3db8c2ddac729b8020 100644 (file)
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gauge.h
+// Name:        wx/os2/gauge.h

 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:


@@ -12,9 +12,7 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 

-#include "wx/control.h"
-
-class WXDLLEXPORT wxGauge: public wxControl
+class WXDLLEXPORT wxGauge: public wxGaugeBase

 {
 public:
     inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }
 {
 public:
     inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }


@@ -78,4 +76,3 @@ private:
 }; // end of CLASS wxGauge
 
 #endif // _WX_GAUGE_H_
 }; // end of CLASS wxGauge
 
 #endif // _WX_GAUGE_H_

-

diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index f0dda60e5055fc4af0a65ae8f622c4521ab78312..9c95081918e446a3462a6d24cefbaaadb85277dd 100644 (file)
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -27,7 +27,7 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );
 
                                       ,wxWindowOS2* pWin
                                      );
 

-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxGaugeBase)

 
 MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd,
                                  UINT uMessage,
 
 MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd,
                                  UINT uMessage,