started for unicode text control, in case we will not be able to get the MLTE EchoMod...

[wxWidgets.git] / src / mac / carbon / gauge.cpp

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index a85fbc498ffacbc22cc601acc40b6835be0ffb0a..19af6c6f41335b01e1b97f092dfbf0c721d186fd 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.cpp
 // Purpose:     wxGauge class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.cpp
 // Purpose:     wxGauge class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -19,67 +19,67 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 

+#include "wx/mac/uma.h"
+

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

-           const wxSize& size,
+           const wxSize& s,

            long style,
            const wxValidator& validator,
            const wxString& name)
 {
            long style,
            const wxValidator& validator,
            const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-    m_rangeMax = range;
-    m_windowStyle = style;
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
-
-
-    // TODO
-    return FALSE;
-}
-
-void wxGauge::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
+        return false;
+
+    wxSize size = s ;
+
+    m_rangeMax = range ;
+    m_gaugePos = 0 ;
+    
+    if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
+    {
+        size = wxSize( 200 , 16 ) ;
+    }
+    
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , range, 
+        kControlProgressBarProc , (long) this ) ;
+    
+    MacPostControlCreate(pos,size) ;
+    
+    return TRUE;

 }
 
 void wxGauge::SetShadowWidth(int w)
 {
 }
 
 void wxGauge::SetShadowWidth(int w)
 {

-    // TODO optional

 }
 
 void wxGauge::SetBezelFace(int w)
 {
 }
 
 void wxGauge::SetBezelFace(int w)
 {

-    // TODO optional

 }
 
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;
 }
 
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;

-    // TODO
+    ::SetControl32BitMaximum( (ControlRef) m_macControl , m_rangeMax ) ;

 }
 
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;
 }
 
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;

-    // TODO
+       ::SetControl32BitValue( (ControlRef) m_macControl , m_gaugePos ) ;

 }
 
 int wxGauge::GetShadowWidth() const
 {
 }
 
 int wxGauge::GetShadowWidth() const
 {

-    // TODO optional

     return 0;
 }
 
 int wxGauge::GetBezelFace() const
 {
     return 0;
 }
 
 int wxGauge::GetBezelFace() const
 {

-    // TODO optional

     return 0;
 }
 
     return 0;
 }