fixed inconsistent dllspec warning in DLL build

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

diff --git a/src/cocoa/slider.mm b/src/cocoa/slider.mm
index f239be10036bf5aadbd7005d7d05eb6e7a0ef64b..2183b7b5cc84c59cf63f4219965bf958b7f77d69 100644 (file)
--- a/src/cocoa/slider.mm
+++ b/src/cocoa/slider.mm
@@ -6,13 +6,18 @@
 // Created:     2003/06/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/06/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
-#include "wx/slider.h"
+#include "wx/wxprec.h"
+#if wxUSE_SLIDER

 
 

-#import <AppKit/NSView.h>
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/slider.h"
+#endif //WX_PRECOMP
+
+#import <AppKit/NSSlider.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 BEGIN_EVENT_TABLE(wxSlider, wxSliderBase)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 BEGIN_EVENT_TABLE(wxSlider, wxSliderBase)


@@ -26,16 +31,17 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID winid,
 {
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
 {
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;

-    SetNSView([[NSView alloc] initWithFrame: NSMakeRect(10,10,20,20)]);
+    SetNSView([[NSSlider alloc] initWithFrame: MakeDefaultNSRect(size)]);

     [m_cocoaNSView release];
     if(m_parent)
         m_parent->CocoaAddChild(this);
     [m_cocoaNSView release];
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    SetInitialFrameRect(pos,size);
+

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

-    CocoaRemoveFromParent();
-    SetNSView(NULL);

 }
 
 }
 

+#endif // wxUSE_SLIDER