Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-29 12:34:54 +00:00
parent 49751a58f0
commit 577246ef3a
3 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/wx/mac/carbon/private.h
View File

@@ -30,50 +30,6 @@ typedef SInt32 SRefCon;
#include "wx/listbox.h" #include "wx/listbox.h"
#ifndef __LP64__
class WXDLLEXPORT wxMacPortSaver
{
DECLARE_NO_COPY_CLASS(wxMacPortSaver)
public:
wxMacPortSaver( GrafPtr port );
~wxMacPortSaver();
private :
GrafPtr m_port;
};
/*
Clips to the visible region of a control within the current port
*/
class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
{
DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
public:
wxMacWindowClipper( const wxWindow* win );
~wxMacWindowClipper();
private:
GrafPtr m_newPort;
RgnHandle m_formerClip;
RgnHandle m_newClip;
};
class WXDLLEXPORT wxMacWindowStateSaver : public wxMacWindowClipper
{
DECLARE_NO_COPY_CLASS(wxMacWindowStateSaver)
public:
wxMacWindowStateSaver( const wxWindow* win );
~wxMacWindowStateSaver();
private:
GrafPtr m_newPort;
ThemeDrawingState m_themeDrawingState;
};
#endif
class WXDLLEXPORT wxMacCGContextStateSaver class WXDLLEXPORT wxMacCGContextStateSaver
{ {
DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver) DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
@@ -418,6 +374,14 @@ WXDLLIMPEXP_CORE Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint
ControlActionUPP GetwxMacLiveScrollbarActionProc(); ControlActionUPP GetwxMacLiveScrollbarActionProc();
// additional optional event defines
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
enum {
kEventControlFocusPartChanged = 164
};
#endif
class wxMacControl : public wxObject class wxMacControl : public wxObject
{ {
public : public :

1
include/wx/mac/carbon/textctrl.h
View File

@@ -162,7 +162,6 @@ public:
void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateDelete(wxUpdateUIEvent& event);
void OnUpdateSelectAll(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event);
void OnEraseBackground(wxEraseEvent& event);
void OnContextMenu(wxContextMenuEvent& event); void OnContextMenu(wxContextMenuEvent& event);
virtual bool MacCanFocus() const virtual bool MacCanFocus() const

1
include/wx/mac/carbon/window.h
View File

@@ -136,7 +136,6 @@ public:
// event handlers // event handlers
// -------------- // --------------
void OnSetFocus( wxFocusEvent& event );
void OnPaint( wxPaintEvent& event ); void OnPaint( wxPaintEvent& event );
void OnNcPaint( wxNcPaintEvent& event ); void OnNcPaint( wxNcPaintEvent& event );
void OnEraseBackground(wxEraseEvent& event ); void OnEraseBackground(wxEraseEvent& event );