making sure creation is setup correctly for wx-frame coordinates into cocoa-content...

[wxWidgets.git] / src / osx / cocoa / bmpbuttn.mm

diff --git a/src/osx/cocoa/bmpbuttn.mm b/src/osx/cocoa/bmpbuttn.mm
index 87a99d0f8099aaf8dbc2db4de42dd0d90378841a..bc9a26325d1e6ef3a80317695d066601220dfcf8 100644 (file)
--- a/src/osx/cocoa/bmpbuttn.mm
+++ b/src/osx/cocoa/bmpbuttn.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/bmpbuttn.cpp
+// Name:        src/osx/carbon/bmpbuttn.cpp

 // Purpose:     wxBitmapButton
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxBitmapButton
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,40 +9,4 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/wxprec.h"
-
-#if wxUSE_BMPBUTTON
-
-#include "wx/bmpbuttn.h"
-#include "wx/image.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dcmemory.h"
-#endif
-
-#include "wx/osx/private.h"
-
-wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxBitmap& bitmap,
-                                    const wxPoint& pos, 
-                                    const wxSize& size,
-                                    long style, 
-                                    long extraStyle) 
-{
-    NSView* sv = (wxpeer->GetParent()->GetHandle() );
-    
-    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
-    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
-    
-    [v setBezelStyle:NSRegularSquareBezelStyle];
-    
-    [v setButtonType:NSMomentaryPushInButton];
-    [sv addSubview:v];
-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
-    [v setImplementation:c];
-    return c;
-}
-
-#endif
+// everything is done in button.mm now
\ No newline at end of file