Implemented Enable for wxMenuBar to avoid assert

[wxWidgets.git] / src / cocoa / spinbutt.mm

diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm
index ff0c9d11bfd75da3957eb86c2c3957dc4bdfe846..5a823ce2ec354489c2053a5c569169706bf989b1 100644 (file)
--- a/src/cocoa/spinbutt.mm
+++ b/src/cocoa/spinbutt.mm
@@ -9,10 +9,12 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/setup.h"
+#include "wx/wxprec.h"

 #if wxUSE_SPINBTN
 
 #if wxUSE_SPINBTN
 

-#include "wx/app.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif //WX_PRECOMP

 #include "wx/spinbutt.h"
 
 #import <AppKit/NSStepper.h>
 #include "wx/spinbutt.h"
 
 #import <AppKit/NSStepper.h>


@@ -30,15 +32,48 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID winid,
 {
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
 {
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;

-    SetNSControl([[NSStepper alloc] initWithFrame: NSMakeRect(10,10,20,20)]);
+    SetNSControl([[NSStepper alloc] initWithFrame: MakeDefaultNSRect(size)]);

     [m_cocoaNSView release];
     [m_cocoaNSView release];

+    [(NSStepper*)m_cocoaNSView setTarget: sm_cocoaTarget];
+    [(NSStepper*)m_cocoaNSView setAction:@selector(wxNSControlAction:)];

     if(m_parent)
         m_parent->CocoaAddChild(this);
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    SetInitialFrameRect(pos,size);
+

     return true;
 }
 
 wxSpinButton::~wxSpinButton()
 {
     return true;
 }
 
 wxSpinButton::~wxSpinButton()
 {

+    [(NSStepper*)m_cocoaNSView setTarget: nil];
+    [(NSStepper*)m_cocoaNSView setAction: nil];
+}
+
+int wxSpinButton::GetValue() const
+{
+    return [(NSStepper*)m_cocoaNSView intValue];
+}
+
+void wxSpinButton::SetValue(int value)
+{
+    [(NSStepper*)m_cocoaNSView setIntValue:value];
+}
+
+void wxSpinButton::SetRange(int minValue, int maxValue)
+{
+    [(NSStepper*)m_cocoaNSView setMinValue:minValue];
+    [(NSStepper*)m_cocoaNSView setMaxValue:maxValue];
+    wxSpinButtonBase::SetRange(minValue,maxValue);
+}
+
+void wxSpinButton::CocoaTarget_action()
+{
+    /* TODO: up/down events */
+    /* This sends the changed event (not specific on up or down) */
+    wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, GetId());
+    event.SetPosition(GetValue());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);

 }
 
 #endif // wxUSE_SPINBTN
 }
 
 #endif // wxUSE_SPINBTN