dispatch for header files in order to keep old way of includes working
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,63 +1,5 @@
|
||||
#include <wx/wx.h>
|
||||
#include <IOKit/IOKitLib.h>
|
||||
#include <IOKit/IOCFPlugIn.h>
|
||||
#include <IOKit/hid/IOHIDLib.h>
|
||||
#include <IOKit/hid/IOHIDKeys.h>
|
||||
#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
|
||||
|
||||
#include <mach/mach.h>
|
||||
|
||||
//Utility wrapper around CFArray
|
||||
class wxCFArray
|
||||
{
|
||||
public:
|
||||
wxCFArray(CFTypeRef pData) : pArray((CFArrayRef) pData) {}
|
||||
CFTypeRef operator [] (const int& nIndex) {return CFArrayGetValueAtIndex(pArray, nIndex); }
|
||||
int Count() {return CFArrayGetCount(pArray);}
|
||||
private:
|
||||
CFArrayRef pArray;
|
||||
};
|
||||
|
||||
//
|
||||
// A wrapper around OS X HID Manager procedures.
|
||||
// The tutorial "Working With HID Class Device Interfaces" Is
|
||||
// Quite good, as is the sample program associated with it
|
||||
// (Depite the author's protests!).
|
||||
class wxHIDDevice
|
||||
{
|
||||
public:
|
||||
wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {}
|
||||
//kHIDPage_GenericDesktop
|
||||
//kHIDUsage_GD_Joystick,kHIDUsage_GD_Mouse,kHIDUsage_GD_Keyboard
|
||||
bool Create (const int& nClass = -1, const int& nType = -1);
|
||||
|
||||
inline void AddCookie(CFTypeRef Data, const int& i);
|
||||
inline void AddCookieInQueue(CFTypeRef Data, const int& i);
|
||||
inline void InitCookies(const size_t& dwSize, bool bQueue = false);
|
||||
|
||||
//Must be implemented by derived classes
|
||||
//builds the cookie array -
|
||||
//first call InitCookies to initialize the cookie
|
||||
//array, then AddCookie to add a cookie at a certain point in an array
|
||||
virtual void BuildCookies(wxCFArray& Array) = 0;
|
||||
|
||||
//checks to see whether the cookie at index nIndex is active (element value != 0)
|
||||
bool IsActive(const int& nIndex);
|
||||
|
||||
//closes the device and cleans the queue and cookies
|
||||
virtual ~wxHIDDevice();
|
||||
private:
|
||||
IOHIDDeviceInterface** m_ppDevice; //this, essentially
|
||||
IOHIDQueueInterface** m_ppQueue; //queue (if we want one)
|
||||
IOHIDElementCookie* m_pCookies; //cookies
|
||||
|
||||
const char* m_szName; //(product) name
|
||||
mach_port_t m_pPort;
|
||||
};
|
||||
|
||||
class wxHIDKeyboard : public wxHIDDevice
|
||||
{
|
||||
public:
|
||||
bool Create();
|
||||
virtual void BuildCookies(wxCFArray& Array);
|
||||
};
|
||||
#if __WXMAC_CLASSIC__
|
||||
#include "wx/mac/classic/private/hid.h"
|
||||
#else
|
||||
#include "wx/mac/carbon/private/hid.h"
|
||||
#endif
|
@@ -1,107 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: print.h
|
||||
// Purpose: private implementation for printing on MacOS
|
||||
// Author: Stefan Csomor
|
||||
// Modified by:
|
||||
// Created: 03/02/99
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_MAC_PRIVATE_PRINT_H_
|
||||
#define _WX_MAC_PRIVATE_PRINT_H_
|
||||
|
||||
#include "wx/cmndata.h"
|
||||
#include "wx/mac/private.h"
|
||||
|
||||
#if TARGET_CARBON && !defined(__DARWIN__)
|
||||
# include <PMApplication.h>
|
||||
#endif
|
||||
|
||||
#ifndef __DARWIN__
|
||||
# include "Printing.h"
|
||||
#endif
|
||||
|
||||
#if TARGET_CARBON
|
||||
#if !PM_USE_SESSION_APIS
|
||||
#error "only Carbon Printing Session API is supported"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
class wxNativePrintData
|
||||
{
|
||||
public :
|
||||
wxNativePrintData() {}
|
||||
virtual ~wxNativePrintData() {}
|
||||
|
||||
virtual void TransferFrom( wxPrintData * ) = 0 ;
|
||||
virtual void TransferTo( wxPrintData * ) = 0 ;
|
||||
|
||||
virtual void TransferFrom( wxPageSetupDialogData * ) = 0 ;
|
||||
virtual void TransferTo( wxPageSetupDialogData * ) = 0 ;
|
||||
|
||||
virtual void TransferFrom( wxPrintDialogData * ) = 0 ;
|
||||
virtual void TransferTo( wxPrintDialogData * ) = 0 ;
|
||||
|
||||
virtual void CopyFrom( wxNativePrintData * ) = 0;
|
||||
|
||||
virtual int ShowPrintDialog() = 0 ;
|
||||
virtual int ShowPageSetupDialog() = 0 ;
|
||||
|
||||
static wxNativePrintData* Create() ;
|
||||
} ;
|
||||
|
||||
#if TARGET_CARBON
|
||||
|
||||
class wxMacCarbonPrintData : public wxNativePrintData
|
||||
{
|
||||
public :
|
||||
wxMacCarbonPrintData() ;
|
||||
~wxMacCarbonPrintData() ;
|
||||
|
||||
virtual void TransferFrom( wxPrintData * ) ;
|
||||
virtual void TransferTo( wxPrintData * ) ;
|
||||
|
||||
virtual void TransferFrom( wxPageSetupDialogData * ) ;
|
||||
virtual void TransferTo( wxPageSetupDialogData * ) ;
|
||||
|
||||
virtual void TransferFrom( wxPrintDialogData * ) ;
|
||||
virtual void TransferTo( wxPrintDialogData * ) ;
|
||||
|
||||
virtual void CopyFrom( wxNativePrintData * ) ;
|
||||
virtual int ShowPrintDialog() ;
|
||||
virtual int ShowPageSetupDialog() ;
|
||||
private :
|
||||
virtual void ValidateOrCreate() ;
|
||||
public :
|
||||
PMPrintSession m_macPrintSession ;
|
||||
PMPageFormat m_macPageFormat ;
|
||||
PMPrintSettings m_macPrintSettings ;
|
||||
} ;
|
||||
|
||||
#if __WXMAC_CLASSIC__
|
||||
#include "wx/mac/classic/private/print.h"
|
||||
#else
|
||||
|
||||
class wxMacClassicPrintData : public wxNativePrintData
|
||||
{
|
||||
public :
|
||||
wxMacClassicPrintData() ;
|
||||
~wxMacClassicPrintData() ;
|
||||
virtual void TransferFrom( wxPrintData * ) ;
|
||||
virtual void TransferTo( wxPrintData * ) ;
|
||||
virtual void TransferFrom( wxPageSetupDialogData * ) ;
|
||||
virtual void TransferTo( wxPageSetupDialogData * ) ;
|
||||
virtual void TransferFrom( wxPrintDialogData * ) ;
|
||||
virtual void TransferTo( wxPrintDialogData * ) ;
|
||||
virtual void CopyFrom( wxNativePrintData * ) ;
|
||||
virtual int ShowPrintDialog() ;
|
||||
virtual int ShowPageSetupDialog() ;
|
||||
private :
|
||||
virtual void ValidateOrCreate() ;
|
||||
public :
|
||||
THPrint m_macPrintSettings ;
|
||||
} ;
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#include "wx/mac/carbon/private/print.h"
|
||||
#endif
|
Reference in New Issue
Block a user