From: Stefan Csomor Date: Thu, 15 Nov 2007 20:28:06 +0000 (+0000) Subject: cleanup X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/11bdfd1c7d54fce1311d95f782684429c474301d?ds=inline cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h index 33fdd4bb7c..eec6a51be5 100644 --- a/include/wx/mac/carbon/fontdlg.h +++ b/include/wx/mac/carbon/fontdlg.h @@ -20,12 +20,8 @@ */ #ifndef wxMAC_USE_EXPERIMENTAL_FONTDIALOG -#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 -#define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 0 -#else #define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 1 #endif -#endif #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG diff --git a/include/wx/mac/carbon/gsockmac.h b/include/wx/mac/carbon/gsockmac.h index de035d0d40..35516a1860 100644 --- a/include/wx/mac/carbon/gsockmac.h +++ b/include/wx/mac/carbon/gsockmac.h @@ -1,141 +1 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockunx.h - * Copyright: (c) Guilhem Lavaux - * Licence: wxWindows Licence - * Purpose: GSocket Macintosh header - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -#ifndef __GSOCK_UNX_H -#define __GSOCK_UNX_H - -#ifndef __GSOCKET_STANDALONE__ -#include "wx/setup.h" -#endif - -#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) - -#ifndef __GSOCKET_STANDALONE__ -#include "wx/gsocket.h" -#else -#include "gsocket.h" -#endif - -#ifndef OTUNIXERRORS - -#include -#define OTUNIXERRORS 1 -// we get a conflict in OT headers otherwise : -#undef EDEADLK -#include -#include -#include - -#endif - -/* Definition of GSocket */ -class GSocket -{ -public: - GSocket(); - ~GSocket(); - bool IsOk() { return m_ok; } - - void Shutdown(); - GSocketError SetLocal(GAddress *address); - GSocketError SetPeer(GAddress *address); - GAddress *GetLocal(); - GAddress *GetPeer(); - GSocketError SetServer(); - GSocket *WaitConnection(); - bool SetReusable() { return false; } - GSocketError SetNonOriented(); - GSocketError Connect(GSocketStream stream); - int Read(char *buffer, int size); - int Write(const char *buffer, int size); - GSocketEventFlags Select(GSocketEventFlags flags); - void SetNonBlocking(bool non_block); - void SetTimeout(unsigned long millisec); - GSocketError WXDLLIMPEXP_NET GetError(); - void SetCallback(GSocketEventFlags flags, - GSocketCallback callback, char *cdata); - void UnsetCallback(GSocketEventFlags flags); - GSocketError GetSockOpt(int level, int optname, void *optval, int *optlen) - { return GSOCK_INVOP; } - GSocketError SetSockOpt(int level, int optname, - const void *optval, int optlen) - { return GSOCK_INVOP; } - -protected: - bool m_ok; - - /* Input / Output */ - GSocketError Input_Timeout(); - GSocketError Output_Timeout(); - int Recv_Stream(char *buffer, int size); - int Recv_Dgram(char *buffer, int size); - int Send_Stream(const char *buffer, int size); - int Send_Dgram(const char *buffer, int size); - - /* Callbacks */ - void Enable_Events(); - void Disable_Events(); - -// TODO: Make these protected -public: - wxMacNotifierTableRef m_mac_events ; - EndpointRef m_endpoint; - GAddress *m_local; - GAddress *m_peer; - GSocketError m_error; - - bool m_non_blocking; - bool m_server; - bool m_stream; - bool m_oriented; - unsigned long m_timeout; - - /* Callbacks */ - GSocketEventFlags m_detected; - GSocketCallback m_cbacks[GSOCK_MAX_EVENT]; - char *m_data[GSOCK_MAX_EVENT]; - bool m_takesEvents ; -}; - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* Definition of GAddress */ - -struct _GAddress -{ - UInt32 m_host ; - UInt16 m_port ; - GAddressType m_family; - GSocketError m_error; -}; - -/* Callbacks */ - -void _GSocket_Internal_Proc(unsigned long e , void* data ) ; - -/* GAddress */ - -GSocketError _GAddress_translate_from(GAddress *address, - InetAddress *addr ); -GSocketError _GAddress_translate_to(GAddress *address, - InetAddress *addr); - -GSocketError _GAddress_Init_INET(GAddress *address); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ - -#endif /* __GSOCK_UNX_H */ +// TODO REMOVE \ No newline at end of file diff --git a/include/wx/mac/carbon/macnotfy.h b/include/wx/mac/carbon/macnotfy.h index 5e412bcfc0..35516a1860 100644 --- a/include/wx/mac/carbon/macnotfy.h +++ b/include/wx/mac/carbon/macnotfy.h @@ -1,34 +1 @@ -/* ------------------------------------------------------------------------- - * Project: Mac Notifier Support - * Name: macnotfy.h - * Author: Stefan CSomor - * Purpose: Mac Notifier include file - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -#ifndef MAC_NOTIFYERS -#define MAC_NOTIFYERS - -#include "wx/dlimpexp.h" - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef void (*wxMacNotificationProcPtr)(unsigned long event , void* data ) ; - -typedef void *wxMacNotifierTableRef ; -WXDLLIMPEXP_BASE void wxMacCreateNotifierTable() ; -WXDLLIMPEXP_BASE void wxMacDestroyNotifierTable() ; -WXDLLIMPEXP_BASE wxMacNotifierTableRef wxMacGetNotifierTable() ; -WXDLLIMPEXP_BASE void wxMacAddEvent( wxMacNotifierTableRef table , wxMacNotificationProcPtr handler , unsigned long event , void* data , short wakeUp ) ; -WXDLLIMPEXP_BASE void wxMacProcessNotifierEvents() ; -WXDLLIMPEXP_BASE void wxMacProcessNotifierAndPendingEvents() ; -WXDLLIMPEXP_BASE void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data ) ; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* MAC_NOTIFYERS */ +// TODO REMOVE \ No newline at end of file diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index 53aaa10dc5..5c31fc8ba5 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -234,7 +234,7 @@ template<> inline EventParamType wxMacGetEventParamType() { return typeH template<> inline EventParamType wxMacGetEventParamType() { return typeHIRect; } template<> inline EventParamType wxMacGetEventParamType() { return typeVoidPtr; } #endif -#if TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 ) +#if TARGET_API_MAC_OSX template<> inline EventParamType wxMacGetEventParamType() { return typeCFDictionaryRef; } #endif template<> inline EventParamType wxMacGetEventParamType() { return typeCollection; }