don't declare inline function with dllexport declaration, this provokes mingw32 warni...

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

diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm
index 050ab2e0412b3d4cfa54b8906a229c80426eb68c..0be69ca515805a48b39d38d80df93cba6d64e3b9 100644 (file)
--- a/src/cocoa/statbmp.mm
+++ b/src/cocoa/statbmp.mm
@@ -1,23 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/statbmp.mm
+// Name:        src/cocoa/statbmp.mm

 // Purpose:     wxStaticBitmap
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Purpose:     wxStaticBitmap
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

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

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/statbmp.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/statbmp.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/cocoa/autorelease.h"
+

 #import <AppKit/NSImageView.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 #import <AppKit/NSImageView.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)

+

 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)


@@ -29,6 +34,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

+    wxAutoNSAutoreleasePool pool;

     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;


@@ -57,4 +63,3 @@ wxBitmap wxStaticBitmap::GetBitmap() const
 {
     return wxNullBitmap;
 }
 {
     return wxNullBitmap;
 }

-