fix wxStringOutputStream::Write() in Unicode build when the output overlaps a boundar...

[wxWidgets.git] / include / wx / cocoa / window.h

diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h
index a9c1a0c1141c011f63cdba32eff818753f283f22..c8b36b275a2e50d42e565475e17a6162595982b3 100644 (file)
--- a/include/wx/cocoa/window.h
+++ b/include/wx/cocoa/window.h
@@ -81,13 +81,8 @@ public:
     WX_NSAffineTransform CocoaGetWxToBoundsTransform();
 #endif //def __OBJC__
 protected:
     WX_NSAffineTransform CocoaGetWxToBoundsTransform();
 #endif //def __OBJC__
 protected:

-    // enable==false: disables the control
-    // enable==true: enables the control IF it should be enabled
-    bool EnableSelfAndChildren(bool enable);

     // actually enable/disable the cocoa control, overridden by subclasses
     virtual void CocoaSetEnabled(bool enable) { }
     // actually enable/disable the cocoa control, overridden by subclasses
     virtual void CocoaSetEnabled(bool enable) { }

-    // Reflects the state for THIS window (ignoring disables by parents)
-    bool m_shouldBeEnabled;

 
     void CocoaCreateNSScrollView();
     void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent);
 
     void CocoaCreateNSScrollView();
     void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent);


@@ -146,8 +141,8 @@ public:
     // Set/get the window's font
     virtual bool SetFont(const wxFont& f);
 //    inline virtual wxFont& GetFont() const;
     // Set/get the window's font
     virtual bool SetFont(const wxFont& f);
 //    inline virtual wxFont& GetFont() const;

-    virtual void SetLabel(const wxString& WXUNUSED(label)) { }
-    virtual wxString GetLabel() const { return wxEmptyString; }
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;

     // label handling
     // Get character size
     virtual int GetCharHeight() const;
     // label handling
     // Get character size
     virtual int GetCharHeight() const;


@@ -198,7 +193,9 @@ public:
     // NOTE: typically Close() is not virtual, but we want this for Cocoa
     virtual bool Close( bool force = false );
     virtual bool Show( bool show = true );
     // NOTE: typically Close() is not virtual, but we want this for Cocoa
     virtual bool Close( bool force = false );
     virtual bool Show( bool show = true );

-    virtual bool Enable( bool enable = true );
+    virtual void DoEnable( bool enable );
+
+    virtual bool IsDoubleBuffered() const { return true; }

 };
 
 #endif // __WX_COCOA_WINDOW_H__
 };
 
 #endif // __WX_COCOA_WINDOW_H__