As in 2.2.9, toolbars should not get the focus.

[wxWidgets.git] / include / wx / mac / private.h

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index 1e2aa805d589d6db862950fa17772c74cd8c925f..2afc85b37267f4953addd031d927f4abff75f08f 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -15,17 +15,26 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
-#include "wx/window.h"
 
 #if defined(__POWERPC__) && defined(__DARWIN__)
-        #include <Carbon/Carbon.h>
+#    include <Carbon/Carbon.h>
+#    define TARGET_CARBON 1
 #else
-    #include "MacHeaders.c"
+#    include <Quickdraw.h>
+#    include <Appearance.h>
+#    include <Folders.h>
+#    include <Controls.h>
+#    include <ControlDefinitions.h>
+#    include <LowMem.h>
+#    include <Gestalt.h>
 #endif
+
 #if UNIVERSAL_INTERFACES_VERSION < 0x0340
     #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
 #endif
 
+#include "wx/window.h"
+
 class wxMacPortStateHelper 
 {
 public :
@@ -56,6 +65,7 @@ public :
        ~wxMacPortSetter() ;
 private :
        wxMacPortStateHelper m_ph ;
+       const wxDC* m_dc ;
 } ;
 
 class wxMacDrawingHelper
@@ -99,6 +109,7 @@ PicHandle        wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
 CIconHandle     wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  ) ;
 void                   wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
 CTabHandle         wxMacCreateColorTable( int numColors ) ;
+void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap ) ;
 
 #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
 #define MAC_WXHBITMAP(a) (GWorldPtr(a))