compilation fix for old SDKs (VC6...) which don't define HDM_SETBITMAPMARGIN/Header_S...

[wxWidgets.git] / include / wx / osx / cocoa / private.h

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index de4b72ae4692ed5b498681c8337374bec815948a..d998d8950faec92b02ed0b99667c6a8a94af70cf 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -119,6 +119,7 @@ public :
     
     virtual bool        DoHandleMouseEvent(NSEvent *event); 
     virtual bool        DoHandleKeyEvent(NSEvent *event); 
     
     virtual bool        DoHandleMouseEvent(NSEvent *event); 
     virtual bool        DoHandleKeyEvent(NSEvent *event); 

+    virtual void        DoNotifyFocusEvent(bool receivedFocus); 

 
 protected:
     WXWidget m_osxView;
 
 protected:
     WXWidget m_osxView;


@@ -199,7 +200,7 @@ protected :
     // common code snippets for cocoa implementations
     // later to be done using injection in method table
         
     // common code snippets for cocoa implementations
     // later to be done using injection in method table
         

-    #define WXCOCOAIMPL_COMMON_MOUSE_INTERFACE -(void)mouseDown:(NSEvent *)event ;\
+    #define WXCOCOAIMPL_COMMON_EVENTS_INTERFACE -(void)mouseDown:(NSEvent *)event ;\

         -(void)rightMouseDown:(NSEvent *)event ;\
         -(void)otherMouseDown:(NSEvent *)event ;\
         -(void)mouseUp:(NSEvent *)event ;\
         -(void)rightMouseDown:(NSEvent *)event ;\
         -(void)otherMouseDown:(NSEvent *)event ;\
         -(void)mouseUp:(NSEvent *)event ;\


@@ -208,8 +209,10 @@ protected :
         - (void)keyDown:(NSEvent *)event;\
         - (void)keyUp:(NSEvent *)event;\
         - (void)flagsChanged:(NSEvent *)event;\
         - (void)keyDown:(NSEvent *)event;\
         - (void)keyUp:(NSEvent *)event;\
         - (void)flagsChanged:(NSEvent *)event;\

+        - (BOOL) becomeFirstResponder;\
+        - (BOOL) resignFirstResponder;

 
 

-    #define WXCOCOAIMPL_COMMON_MOUSE_IMPLEMENTATION -(void)mouseDown:(NSEvent *)event \
+    #define WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION -(void)mouseDown:(NSEvent *)event \

         {\
             if ( !impl->DoHandleMouseEvent(event) )\
                 [super mouseDown:event];\
         {\
             if ( !impl->DoHandleMouseEvent(event) )\
                 [super mouseDown:event];\


@@ -253,6 +256,20 @@ protected :
         {\
             if ( !impl->DoHandleKeyEvent(event) )\
                 [super flagsChanged:event];\
         {\
             if ( !impl->DoHandleKeyEvent(event) )\
                 [super flagsChanged:event];\

+        }\
+        - (BOOL) becomeFirstResponder\
+        {\
+            BOOL r = [super becomeFirstResponder];\
+            if ( r )\
+                impl->DoNotifyFocusEvent( true );\
+            return r;\
+        }\
+        - (BOOL) resignFirstResponder\
+        {\
+            BOOL r = [super resignFirstResponder];\
+            if ( r )\
+                impl->DoNotifyFocusEvent( false );\
+            return r;\

         }
         
     #define WXCOCOAIMPL_COMMON_MEMBERS wxWidgetCocoaImpl* impl;
         }
         
     #define WXCOCOAIMPL_COMMON_MEMBERS wxWidgetCocoaImpl* impl;


@@ -261,9 +278,9 @@ protected :
         - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;\
         - (wxWidgetCocoaImpl*) implementation;\
         - (BOOL) isFlipped;\
         - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;\
         - (wxWidgetCocoaImpl*) implementation;\
         - (BOOL) isFlipped;\

-        WXCOCOAIMPL_COMMON_MOUSE_INTERFACE
+        WXCOCOAIMPL_COMMON_EVENTS_INTERFACE

 
 

-    #define WXCOCOAIMPL_COMMON_IMPLEMENTATION WXCOCOAIMPL_COMMON_MOUSE_IMPLEMENTATION \
+    #define WXCOCOAIMPL_COMMON_IMPLEMENTATION WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \

         - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\
         {\
             impl = theImplementation;\
         - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\
         {\
             impl = theImplementation;\


@@ -277,6 +294,20 @@ protected :
             return YES;\
         }\
 
             return YES;\
         }\
 

+     #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_NOT_FLIPPED WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \
+        - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\
+        {\
+            impl = theImplementation;\
+        }\
+        - (wxWidgetCocoaImpl*) implementation\
+        {\
+            return impl;\
+        }\
+        - (BOOL) isFlipped\
+        {\
+            return NO;\
+        }\
+

     // used for many wxControls
     
     @interface wxNSButton : NSButton
     // used for many wxControls
     
     @interface wxNSButton : NSButton