implemented wxGetSingleChoiceIndex version that takes wxArrayString

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

diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index 54d06fa5ae00d81a2b6471d916c7420f0201487b..620760fd5f6d5c2ecf85cbaeaadb1d8ac0621daa 100644 (file)
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -46,31 +46,36 @@
 #define ZYZGS_3D        0x8000L     /* control will be 3D       */
 
 /* public function prototypes */
 #define ZYZGS_3D        0x8000L     /* control will be 3D       */
 
 /* public function prototypes */

-BOOL _Optlink gaugeInit(HINSTANCE hInstance);
+// BOOL _Optlink gaugeInit(HINSTANCE hInstance);

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)

-#endif

 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,
            const wxSize& size,
            long style,
 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,
            const wxSize& size,
            long style,

+#if wxUSE_VALIDATORS

            const wxValidator& validator,
            const wxValidator& validator,

+#endif

            const wxString& name)
 {
     static bool wxGaugeOS2Initialised = FALSE;
 
     if ( !wxGaugeOS2Initialised )
     {
            const wxString& name)
 {
     static bool wxGaugeOS2Initialised = FALSE;
 
     if ( !wxGaugeOS2Initialised )
     {

+//TODO:
+/*

       if (!gaugeInit((HINSTANCE) wxGetInstance()))
           wxFatalError("Cannot initalize Gauge library");
       if (!gaugeInit((HINSTANCE) wxGetInstance()))
           wxFatalError("Cannot initalize Gauge library");

+*/

       wxGaugeOS2Initialised = TRUE;
     }
 
     SetName(name);
       wxGaugeOS2Initialised = TRUE;
     }
 
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif

     if (parent) parent->AddChild(this);
     m_rangeMax = range;
     m_gaugePos = 0;
     if (parent) parent->AddChild(this);
     m_rangeMax = range;
     m_gaugePos = 0;