Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

[wxWidgets.git] / include / wx / msw / button.h

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 8ae1f466fd48a61ce91426aee70239fec7a96d2f..1ee21c4d1e27d4822580c37159386e7b5e9f88e8 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -12,15 +12,11 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // Pushbutton
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Pushbutton
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxButton : public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton : public wxButtonBase

 {
 public:
     wxButton() { }
 {
 public:
     wxButton() { }


@@ -47,18 +43,23 @@ public:
 
     virtual ~wxButton();
 
 
     virtual ~wxButton();
 

-    virtual void SetDefault();
+    virtual wxWindow *SetDefault();
+
+    // overridden base class methods
+    virtual void SetLabel(const wxString& label);
+    virtual bool SetBackgroundColour(const wxColour &colour);
+    virtual bool SetForegroundColour(const wxColour &colour);

 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 

-    // coloured buttons support
-    virtual bool SetBackgroundColour(const wxColour &colour);
-    virtual bool SetForegroundColour(const wxColour &colour);
-

     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);

+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }

 
 private:
     void MakeOwnerDrawn();
 
 private:
     void MakeOwnerDrawn();


@@ -76,11 +77,9 @@ protected:
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
 };
 

-#endif
-    // _WX_BUTTON_H_
+#endif // _WX_BUTTON_H_