Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index 8d51f95e7996ea7e2f2f93a3141fb42a5cf77dd4..f101e5626d88db7549c0aa24e88bc5fe54075868 100644 (file)
--- a/include/wx/mac/toplevel.h
+++ b/include/wx/mac/toplevel.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 


@@ -75,19 +75,26 @@ public:
     virtual void Clear() ;
     virtual WXWidget MacGetContainerForEmbedding() ;
     WXWindow MacGetWindowRef() { return m_macWindow ; }
     virtual void Clear() ;
     virtual WXWidget MacGetContainerForEmbedding() ;
     WXWindow MacGetWindowRef() { return m_macWindow ; }

-    virtual void MacActivate( WXEVENTREF ev , bool inIsActivating ) ;
+    virtual void MacActivate( long timestamp , bool inIsActivating ) ;

     virtual void MacUpdate( long timestamp ) ;
     virtual void MacUpdate( long timestamp ) ;

+#if !TARGET_CARBON

     virtual void MacMouseDown( WXEVENTREF ev , short windowPart ) ;
     virtual void MacMouseUp( WXEVENTREF ev , short windowPart ) ;
     virtual void MacMouseMoved( WXEVENTREF ev , short windowPart ) ;
     virtual void MacKeyDown( WXEVENTREF ev ) ;
     virtual void MacMouseDown( WXEVENTREF ev , short windowPart ) ;
     virtual void MacMouseUp( WXEVENTREF ev , short windowPart ) ;
     virtual void MacMouseMoved( WXEVENTREF ev , short windowPart ) ;
     virtual void MacKeyDown( WXEVENTREF ev ) ;

-    virtual void MacFireMouseEvent( WXEVENTREF ev ) ;
+#endif
+    virtual void MacFireMouseEvent( wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) ;

     virtual void Raise();
     virtual void Lower();
     virtual void SetTitle( const wxString& title);
     virtual bool Show( bool show = TRUE );
     virtual void DoMoveWindow(int x, int y, int width, int height);
     void MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) ;
     virtual void Raise();
     virtual void Lower();
     virtual void SetTitle( const wxString& title);
     virtual bool Show( bool show = TRUE );
     virtual void DoMoveWindow(int x, int y, int width, int height);
     void MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) ;

+    short MacGetWindowBackgroundTheme() const { return m_macWindowBackgroundTheme ; }
+
+#if TARGET_CARBON
+       WXEVENTHANDLERREF       MacGetEventHandler() { return m_macEventHandler ; }
+#endif

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -107,6 +114,10 @@ protected:
     bool m_macNeedsErasing ;
 
     static WXWindow s_macWindowInUpdate ;
     bool m_macNeedsErasing ;
 
     static WXWindow s_macWindowInUpdate ;

+private :
+#if TARGET_CARBON
+       WXEVENTHANDLERREF       m_macEventHandler ;
+#endif

 };
 
 // list of all frames and modeless dialogs
 };
 
 // list of all frames and modeless dialogs