don't give error messages if ws2_32.dll is not available in wxGetHostName()

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

diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm
index f288054134e527a14c5a9f136e6b27e2a1d6ed41..050ab2e0412b3d4cfa54b8906a229c80426eb68c 100644 (file)
--- a/src/cocoa/statbmp.mm
+++ b/src/cocoa/statbmp.mm
@@ -9,10 +9,13 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#import <AppKit/NSView.h>
+#import <AppKit/NSImageView.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)


@@ -29,7 +32,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid,
     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;

-    SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSView([[NSImageView alloc] initWithFrame: MakeDefaultNSRect(size)]);

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