Tidied up white space and tabs in wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
072df0b3af
commit
d921af5140
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_ACCEL_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
@ -93,8 +93,8 @@ public:
|
||||
void DeletePendingObjects();
|
||||
bool IsExiting() { return !m_keepGoing ; }
|
||||
#if TARGET_CARBON
|
||||
WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; }
|
||||
WXEVENTHANDLERREF MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
|
||||
WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; }
|
||||
WXEVENTHANDLERREF MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
|
||||
#endif
|
||||
|
||||
public:
|
||||
@ -111,8 +111,8 @@ private:
|
||||
|
||||
// mac specifics
|
||||
#if TARGET_CARBON
|
||||
WXEVENTHANDLERREF m_macEventHandler ;
|
||||
WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
|
||||
WXEVENTHANDLERREF m_macEventHandler ;
|
||||
WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
|
||||
#endif
|
||||
WXEVENTREF m_macCurrentEvent ;
|
||||
|
||||
@ -164,21 +164,21 @@ public:
|
||||
|
||||
#endif
|
||||
|
||||
void MacHandleMenuCommand( wxUint32 command ) ;
|
||||
bool MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
|
||||
bool MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
|
||||
|
||||
void MacHandleMenuCommand( wxUint32 command ) ;
|
||||
bool MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
|
||||
bool MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
|
||||
|
||||
virtual short MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
|
||||
virtual short MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
|
||||
virtual short MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
|
||||
virtual short MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
|
||||
|
||||
// in response of an open-document apple event
|
||||
virtual void MacOpenFile(const wxString &fileName) ;
|
||||
virtual void MacOpenFile(const wxString &fileName) ;
|
||||
// in response of a print-document apple event
|
||||
virtual void MacPrintFile(const wxString &fileName) ;
|
||||
virtual void MacPrintFile(const wxString &fileName) ;
|
||||
// in response of a open-application apple event
|
||||
virtual void MacNewFile() ;
|
||||
virtual void MacNewFile() ;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_BITMAP_H_
|
||||
@ -84,8 +84,8 @@ public:
|
||||
wxPalette m_bitmapPalette;
|
||||
int m_quality;
|
||||
|
||||
int m_bitmapType ;
|
||||
WXHMETAFILE m_hPict ;
|
||||
int m_bitmapType ;
|
||||
WXHMETAFILE m_hPict ;
|
||||
WXHBITMAP m_hBitmap;
|
||||
WXHICON m_hIcon ;
|
||||
wxMask * m_bitmapMask; // Optional mask
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_BMPBUTTN_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_BRUSH_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_BUTTON_H_
|
||||
@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxButtonNameStr);
|
||||
|
||||
virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
|
||||
virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
|
||||
static wxSize GetDefaultSize();
|
||||
|
||||
virtual void SetDefault();
|
||||
|
@ -58,11 +58,11 @@ public:
|
||||
void OnChar(wxKeyEvent& event) ;
|
||||
void OnLeftClick(wxMouseEvent& event) ;
|
||||
|
||||
// metrics
|
||||
wxInt32 m_checkBoxWidth;
|
||||
// metrics
|
||||
wxInt32 m_checkBoxWidth;
|
||||
wxInt32 m_checkBoxHeight;
|
||||
wxInt32 m_TextBaseLineOffset;
|
||||
|
||||
wxInt32 m_TextBaseLineOffset;
|
||||
|
||||
// the array containing the checked status of the items
|
||||
wxArrayInt m_checks;
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_CHOICE_H_
|
||||
@ -67,7 +67,7 @@ public:
|
||||
virtual int FindString(const wxString& s) const;
|
||||
virtual wxString GetString(int n) const ;
|
||||
virtual void SetString( int , const wxString& s ) ;
|
||||
void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
|
||||
void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
|
||||
|
||||
/*
|
||||
virtual void Append(const wxString& item);
|
||||
@ -81,7 +81,7 @@ public:
|
||||
|
||||
// Mac specific
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
|
||||
void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
|
||||
|
||||
virtual inline int GetColumns() const { return 1 ; };
|
||||
*/
|
||||
@ -98,8 +98,8 @@ protected:
|
||||
|
||||
wxArrayString m_strings;
|
||||
wxChoiceDataArray m_datas ;
|
||||
WXHMENU m_macPopUpMenuHandle ;
|
||||
WXHMENU m_macPopUpMenuHandle ;
|
||||
};
|
||||
|
||||
#endif
|
||||
// _WX_CHOICE_H_
|
||||
// _WX_CHOICE_H_
|
||||
|
@ -9,7 +9,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_CLIPBRD_H_
|
||||
|
@ -7,7 +7,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_COLORDLG_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_CONTROL_H_
|
||||
@ -55,34 +55,34 @@ public:
|
||||
|
||||
void OnEraseBackground(wxEraseEvent& event);
|
||||
|
||||
virtual bool Enable(bool enable = TRUE) ;
|
||||
virtual bool Show(bool show = TRUE) ;
|
||||
|
||||
virtual void MacRedrawControl () ;
|
||||
virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
|
||||
virtual void MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size, long style,
|
||||
const wxValidator& validator,
|
||||
const wxString& name ,
|
||||
WXRECTPTR outBounds ,
|
||||
unsigned char* maclabel ) ;
|
||||
virtual void MacPostControlCreate() ;
|
||||
virtual void MacAdjustControlRect() ;
|
||||
virtual bool Enable(bool enable = TRUE) ;
|
||||
virtual bool Show(bool show = TRUE) ;
|
||||
|
||||
virtual void MacRedrawControl () ;
|
||||
virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
|
||||
virtual void MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size, long style,
|
||||
const wxValidator& validator,
|
||||
const wxString& name ,
|
||||
WXRECTPTR outBounds ,
|
||||
unsigned char* maclabel ) ;
|
||||
virtual void MacPostControlCreate() ;
|
||||
virtual void MacAdjustControlRect() ;
|
||||
virtual WXWidget MacGetContainerForEmbedding() ;
|
||||
virtual void MacSuperChangedPosition() ;
|
||||
virtual void MacSuperEnabled( bool enabled ) ;
|
||||
virtual void MacSuperShown( bool show ) ;
|
||||
virtual bool MacCanFocus() const ;
|
||||
virtual void MacUpdateDimensions() ;
|
||||
virtual void MacSuperChangedPosition() ;
|
||||
virtual void MacSuperEnabled( bool enabled ) ;
|
||||
virtual void MacSuperShown( bool show ) ;
|
||||
virtual bool MacCanFocus() const ;
|
||||
virtual void MacUpdateDimensions() ;
|
||||
void* MacGetControlAction() { return m_macControlAction ; }
|
||||
|
||||
virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
|
||||
void OnKeyDown( wxKeyEvent &event ) ;
|
||||
void OnMouseEvent( wxMouseEvent &event ) ;
|
||||
void OnPaint(wxPaintEvent& event) ;
|
||||
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
|
||||
WXWidget GetMacControl() { return m_macControl ;}
|
||||
virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
|
||||
void OnKeyDown( wxKeyEvent &event ) ;
|
||||
void OnMouseEvent( wxMouseEvent &event ) ;
|
||||
void OnPaint(wxPaintEvent& event) ;
|
||||
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
|
||||
WXWidget GetMacControl() { return m_macControl ;}
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_CURSOR_H_
|
||||
@ -29,11 +29,11 @@ public:
|
||||
~wxCursorRefData();
|
||||
|
||||
protected:
|
||||
WXHCURSOR m_hCursor;
|
||||
bool m_disposeHandle;
|
||||
bool m_releaseHandle;
|
||||
WXHCURSOR m_hCursor;
|
||||
bool m_disposeHandle;
|
||||
bool m_releaseHandle;
|
||||
bool m_isColorCursor ;
|
||||
long m_themeCursor ;
|
||||
long m_themeCursor ;
|
||||
};
|
||||
|
||||
#define M_CURSORDATA ((wxCursorRefData *)m_refData)
|
||||
@ -57,7 +57,7 @@ public:
|
||||
|
||||
wxCursor(const wxImage & image) ;
|
||||
|
||||
wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
|
||||
wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
|
||||
int hotSpotX = 0, int hotSpotY = 0);
|
||||
|
||||
wxCursor(int cursor_type);
|
||||
@ -69,7 +69,7 @@ public:
|
||||
inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
|
||||
inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
|
||||
|
||||
void MacInstall() const ;
|
||||
void MacInstall() const ;
|
||||
|
||||
void SetHCURSOR(WXHCURSOR cursor);
|
||||
inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
|
||||
|
@ -41,11 +41,11 @@ public:
|
||||
virtual bool SetData(size_t len, const void *buf);
|
||||
|
||||
protected :
|
||||
void Init() ;
|
||||
void Clear() ;
|
||||
|
||||
void* m_pictHandle ;
|
||||
bool m_pictCreated ;
|
||||
void Init() ;
|
||||
void Clear() ;
|
||||
|
||||
void* m_pictHandle ;
|
||||
bool m_pictCreated ;
|
||||
private:
|
||||
// Virtual function hiding supression
|
||||
size_t GetDataSize(const wxDataFormat& rFormat) const
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DC_H_
|
||||
@ -27,14 +27,14 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef MM_TEXT
|
||||
#define MM_TEXT 0
|
||||
#define MM_ISOTROPIC 1
|
||||
#define MM_ANISOTROPIC 2
|
||||
#define MM_LOMETRIC 3
|
||||
#define MM_HIMETRIC 4
|
||||
#define MM_TWIPS 5
|
||||
#define MM_POINTS 6
|
||||
#define MM_METRIC 7
|
||||
#define MM_TEXT 0
|
||||
#define MM_ISOTROPIC 1
|
||||
#define MM_ANISOTROPIC 2
|
||||
#define MM_LOMETRIC 3
|
||||
#define MM_HIMETRIC 4
|
||||
#define MM_TWIPS 5
|
||||
#define MM_POINTS 6
|
||||
#define MM_METRIC 7
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -109,82 +109,82 @@ class WXDLLEXPORT wxDC: public wxDCBase
|
||||
|
||||
|
||||
wxCoord XDEV2LOG(wxCoord x) const
|
||||
{
|
||||
long new_x = x - m_deviceOriginX ;
|
||||
if (new_x > 0)
|
||||
return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
|
||||
else
|
||||
return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
|
||||
}
|
||||
{
|
||||
long new_x = x - m_deviceOriginX ;
|
||||
if (new_x > 0)
|
||||
return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
|
||||
else
|
||||
return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
|
||||
}
|
||||
wxCoord XDEV2LOGREL(wxCoord x) const
|
||||
{
|
||||
if (x > 0)
|
||||
return (wxCoord)((double)(x) / m_scaleX + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(x) / m_scaleX - 0.5);
|
||||
}
|
||||
{
|
||||
if (x > 0)
|
||||
return (wxCoord)((double)(x) / m_scaleX + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(x) / m_scaleX - 0.5);
|
||||
}
|
||||
wxCoord YDEV2LOG(wxCoord y) const
|
||||
{
|
||||
long new_y = y - m_deviceOriginY ;
|
||||
if (new_y > 0)
|
||||
return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
|
||||
else
|
||||
return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
|
||||
}
|
||||
{
|
||||
long new_y = y - m_deviceOriginY ;
|
||||
if (new_y > 0)
|
||||
return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
|
||||
else
|
||||
return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
|
||||
}
|
||||
wxCoord YDEV2LOGREL(wxCoord y) const
|
||||
{
|
||||
if (y > 0)
|
||||
return (wxCoord)((double)(y) / m_scaleY + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(y) / m_scaleY - 0.5);
|
||||
}
|
||||
{
|
||||
if (y > 0)
|
||||
return (wxCoord)((double)(y) / m_scaleY + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(y) / m_scaleY - 0.5);
|
||||
}
|
||||
wxCoord XLOG2DEV(wxCoord x) const
|
||||
{
|
||||
long new_x = x - m_logicalOriginX;
|
||||
if (new_x > 0)
|
||||
return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX ;
|
||||
else
|
||||
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ;
|
||||
}
|
||||
{
|
||||
long new_x = x - m_logicalOriginX;
|
||||
if (new_x > 0)
|
||||
return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX ;
|
||||
else
|
||||
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ;
|
||||
}
|
||||
wxCoord XLOG2DEVREL(wxCoord x) const
|
||||
{
|
||||
if (x > 0)
|
||||
return (wxCoord)((double)(x) * m_scaleX + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(x) * m_scaleX - 0.5);
|
||||
}
|
||||
{
|
||||
if (x > 0)
|
||||
return (wxCoord)((double)(x) * m_scaleX + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(x) * m_scaleX - 0.5);
|
||||
}
|
||||
wxCoord YLOG2DEV(wxCoord y) const
|
||||
{
|
||||
long new_y = y - m_logicalOriginY ;
|
||||
if (new_y > 0)
|
||||
return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY ;
|
||||
else
|
||||
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ;
|
||||
}
|
||||
{
|
||||
long new_y = y - m_logicalOriginY ;
|
||||
if (new_y > 0)
|
||||
return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY ;
|
||||
else
|
||||
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ;
|
||||
}
|
||||
wxCoord YLOG2DEVREL(wxCoord y) const
|
||||
{
|
||||
if (y > 0)
|
||||
return (wxCoord)((double)(y) * m_scaleY + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(y) * m_scaleY - 0.5);
|
||||
}
|
||||
{
|
||||
if (y > 0)
|
||||
return (wxCoord)((double)(y) * m_scaleY + 0.5);
|
||||
else
|
||||
return (wxCoord)((double)(y) * m_scaleY - 0.5);
|
||||
}
|
||||
wxCoord XLOG2DEVMAC(wxCoord x) const
|
||||
{
|
||||
long new_x = x - m_logicalOriginX;
|
||||
if (new_x > 0)
|
||||
return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
|
||||
else
|
||||
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
|
||||
}
|
||||
{
|
||||
long new_x = x - m_logicalOriginX;
|
||||
if (new_x > 0)
|
||||
return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
|
||||
else
|
||||
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
|
||||
}
|
||||
wxCoord YLOG2DEVMAC(wxCoord y) const
|
||||
{
|
||||
long new_y = y - m_logicalOriginY ;
|
||||
if (new_y > 0)
|
||||
return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
|
||||
else
|
||||
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
|
||||
}
|
||||
|
||||
{
|
||||
long new_y = y - m_logicalOriginY ;
|
||||
if (new_y > 0)
|
||||
return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
|
||||
else
|
||||
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
|
||||
}
|
||||
|
||||
WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
|
||||
static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;
|
||||
//
|
||||
@ -252,41 +252,41 @@ protected:
|
||||
// not yet used
|
||||
bool m_needComputeScaleX,m_needComputeScaleY;
|
||||
// If un-scrolled is non-zero or d.o. changes with scrolling.
|
||||
// Set using SetInternalDeviceOrigin().
|
||||
long m_internalDeviceOriginX,m_internalDeviceOriginY;
|
||||
// To be set by external classes such as wxScrolledWindow
|
||||
// using SetDeviceOrigin()
|
||||
long m_externalDeviceOriginX,m_externalDeviceOriginY;
|
||||
// Set using SetInternalDeviceOrigin().
|
||||
long m_internalDeviceOriginX,m_internalDeviceOriginY;
|
||||
// To be set by external classes such as wxScrolledWindow
|
||||
// using SetDeviceOrigin()
|
||||
long m_externalDeviceOriginX,m_externalDeviceOriginY;
|
||||
|
||||
// Begin implementation for Mac
|
||||
public:
|
||||
|
||||
WXHDC m_macPort ;
|
||||
WXHBITMAP m_macMask ;
|
||||
|
||||
WXHDC m_macPort ;
|
||||
WXHBITMAP m_macMask ;
|
||||
|
||||
// in order to preserve the const inheritance of the virtual functions, we have to
|
||||
// use mutable variables starting from CWPro 5
|
||||
// in order to preserve the const inheritance of the virtual functions, we have to
|
||||
// use mutable variables starting from CWPro 5
|
||||
|
||||
void MacInstallFont() const ;
|
||||
void MacInstallPen() const ;
|
||||
void MacInstallBrush() const ;
|
||||
|
||||
mutable bool m_macFontInstalled ;
|
||||
mutable bool m_macPenInstalled ;
|
||||
mutable bool m_macBrushInstalled ;
|
||||
|
||||
WXHRGN m_macBoundaryClipRgn ;
|
||||
WXHRGN m_macCurrentClipRgn ;
|
||||
wxPoint m_macLocalOrigin ;
|
||||
void MacSetupPort( wxMacPortStateHelper* ph ) const ;
|
||||
void MacCleanupPort( wxMacPortStateHelper* ph ) const ;
|
||||
mutable void* m_macATSUIStyle ;
|
||||
mutable wxMacPortStateHelper* m_macCurrentPortStateHelper ;
|
||||
mutable bool m_macFormerAliasState ;
|
||||
mutable short m_macFormerAliasSize ;
|
||||
mutable bool m_macAliasWasEnabled ;
|
||||
mutable void* m_macForegroundPixMap ;
|
||||
mutable void* m_macBackgroundPixMap ;
|
||||
void MacInstallFont() const ;
|
||||
void MacInstallPen() const ;
|
||||
void MacInstallBrush() const ;
|
||||
|
||||
mutable bool m_macFontInstalled ;
|
||||
mutable bool m_macPenInstalled ;
|
||||
mutable bool m_macBrushInstalled ;
|
||||
|
||||
WXHRGN m_macBoundaryClipRgn ;
|
||||
WXHRGN m_macCurrentClipRgn ;
|
||||
wxPoint m_macLocalOrigin ;
|
||||
void MacSetupPort( wxMacPortStateHelper* ph ) const ;
|
||||
void MacCleanupPort( wxMacPortStateHelper* ph ) const ;
|
||||
mutable void* m_macATSUIStyle ;
|
||||
mutable wxMacPortStateHelper* m_macCurrentPortStateHelper ;
|
||||
mutable bool m_macFormerAliasState ;
|
||||
mutable short m_macFormerAliasSize ;
|
||||
mutable bool m_macAliasWasEnabled ;
|
||||
mutable void* m_macForegroundPixMap ;
|
||||
mutable void* m_macBackgroundPixMap ;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DCCLIENT_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DCMEMORY_H_
|
||||
@ -28,8 +28,8 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
|
||||
~wxMemoryDC(void);
|
||||
virtual void SelectObject( const wxBitmap& bitmap );
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
wxBitmap GetSelectedObject() { return m_selected ; }
|
||||
private:
|
||||
wxBitmap GetSelectedObject() { return m_selected ; }
|
||||
private:
|
||||
wxBitmap m_selected;
|
||||
};
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DCPRINT_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DCSCREEN_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DIALOG_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DIRDLG_H_
|
||||
|
@ -6,7 +6,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_FILEDLG_H_
|
||||
|
@ -106,12 +106,12 @@ protected:
|
||||
bool m_noAA; // No anti-aliasing
|
||||
|
||||
public:
|
||||
short m_macFontNum;
|
||||
short m_macFontSize;
|
||||
short m_macFontNum;
|
||||
short m_macFontSize;
|
||||
unsigned char m_macFontStyle;
|
||||
wxUint32 m_macATSUFontID;
|
||||
public:
|
||||
void MacFindFont() ;
|
||||
void MacFindFont() ;
|
||||
};
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFont
|
||||
|
@ -7,7 +7,7 @@
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_FONTDLG_H_
|
||||
|
Loading…
Reference in New Issue
Block a user