X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853f8094df1f71db3c7ff27cdf57127ef07a16b0..26dddf6c3455f95bef2dcb2a0a514fa0558b50ab:/include/wx/mac/window.h

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 119d88726f..807e261863 100644
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "window.h"
 #endif
 
@@ -84,7 +84,6 @@ public:
 
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
-    virtual void Clear();
 
     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont(const wxFont& font)
@@ -116,33 +115,6 @@ public:
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept);
 
-#if WXWIN_COMPATIBILITY
-    // Set/get scroll attributes
-    virtual void SetScrollRange(int orient, int range, bool refresh = TRUE);
-    virtual void SetScrollPage(int orient, int page, bool refresh = TRUE);
-    virtual int OldGetScrollRange(int orient) const;
-    virtual int GetScrollPage(int orient) const;
-
-    // event handlers
-        // Handle a control command
-    virtual void OnCommand(wxWindowMac& win, wxCommandEvent& event);
-
-        // Override to define new behaviour for default action (e.g. double
-        // clicking on a listbox)
-    virtual void OnDefaultAction(wxControl * WXUNUSED(initiatingItem)) { }
-#endif // WXWIN_COMPATIBILITY
-
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-    // caret manipulation (old MSW only functions, see wxCaret class for the
-    // new API)
-    void CreateCaret(int w, int h);
-    void CreateCaret(const wxBitmap *bitmap);
-    void DestroyCaret();
-    void ShowCaret(bool show);
-    void SetCaretPos(int x, int y);
-    void GetCaretPos(int *x, int *y) const;
-#endif // wxUSE_CARET
-
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?
     wxWindowMac* GetWindowChild1(wxWindowID id);
@@ -165,7 +137,6 @@ public:
 //    void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
     virtual WXWidget GetHandle() const { return (WXWidget) NULL ; }
 
-    bool GetUseCtl3D() const { return m_useCtl3D; }
     bool GetTransparentBackground() const { return m_backgroundTransparent; }
     void SetTransparent(bool t = TRUE) { m_backgroundTransparent = t; }
 
@@ -174,7 +145,6 @@ public:
     void OnSetFocus(wxFocusEvent& event) ;
     void OnNcPaint(wxNcPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
-    void OnIdle(wxIdleEvent& event);
     void OnMouseEvent( wxMouseEvent &event ) ;
 
     void MacOnScroll(wxScrollEvent&event ) ;
@@ -182,6 +152,8 @@ public:
     bool AcceptsFocus() const ;
 
 public:
+    void OnInternalIdle();
+
     // For implementation purposes - sometimes decorations make the client area
     // smaller
     virtual wxPoint GetClientAreaOrigin() const;
@@ -198,20 +170,9 @@ public:
     // MSW only: TRUE if this control is part of the main control
     virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
 
- #if WXWIN_COMPATIBILITY
-    wxObject *GetChild(int number) const;
-    virtual void MSWDeviceToLogical(float *x, float *y) const;
-#endif // WXWIN_COMPATIBILITY
-
     // Setup background and foreground colours correctly
     virtual void SetupColours();
 
-
-#if WXWIN_COMPATIBILITY
-    void SetShowing(bool show) { (void)Show(show); }
-    bool IsUserEnabled() const { return IsEnabled(); }
-#endif // WXWIN_COMPATIBILITY
-
 public:
     static bool          MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ;
     virtual bool         MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;
@@ -256,8 +217,6 @@ public:
     static wxWindowMac*  s_lastMouseWindow ;
 private:
 protected:
-//    RgnHandle            m_macUpdateRgn ;
-//    bool                 m_macEraseOnRedraw ;
     wxBrush              m_macBackgroundBrush ;
     wxRegion             m_macVisibleRegion ;
     int                  m_x ;
@@ -272,18 +231,7 @@ protected:
     void                 MacCreateScrollBars( long style ) ;
     void                 MacRepositionScrollBars() ;
 
-    // additional (MSW specific) flags
-    bool                 m_useCtl3D:1; // Using CTL3D for this control
-    bool                 m_backgroundTransparent:1;
-    bool                 m_mouseInWindow:1;
-    bool                 m_doubleClickAllowed:1;
-    bool                 m_winCaptured:1;
-
-    // the size of one page for scrolling
-    int                  m_xThumbSize;
-    int                  m_yThumbSize;
-
-//    WXHMENU               m_hMenu; // Menu, if any
+    bool                 m_backgroundTransparent ;
 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;