cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index f053c3fe774fe1c64fde5ddd7d33cad05d9c924d..e73554f6764ddc73bcc07ae6f61cbddc745393fe 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -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
 {
     DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
 class WXDLLEXPORT 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
 {
 public :
 class wxMacControl : public wxObject
 {
 public :

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index 5f7a4f79d06a7d4e94acdde8407bef3da292bc8e..ad99369e1f350f654c3cbd6ef9e00597473548a4 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -162,7 +162,6 @@ public:
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 

-    void OnEraseBackground(wxEraseEvent& event);

     void OnContextMenu(wxContextMenuEvent& event);
 
     virtual bool MacCanFocus() const
     void OnContextMenu(wxContextMenuEvent& event);
 
     virtual bool MacCanFocus() const

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 43fe62748fe860f50eefc84d140500343f7907a0..76b9f3410f9ac0d48117d812bdac0885c7bdd716 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -136,7 +136,6 @@ public:
 
     // event handlers
     // --------------
 
     // event handlers
     // --------------

-    void OnSetFocus( wxFocusEvent& event );

     void OnPaint( wxPaintEvent& event );
     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );