unified wxTaskBarIcon behaviour: wxMSW version is not removed automatically when...

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index cd0e1df3859b49a4c080ffe5c2a96f3c03ee48bf..bb844575e3b5d699db8acc0ad00eb3f44061ecee 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.h
+// Name:        wx/msw/button.h

 // Purpose:     wxButton class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxButton class
 // Author:      Julian Smart
 // Modified by:


@@ -12,38 +12,38 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "button.h"
 #endif
 
 #pragma interface "button.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
-

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

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

 {
 {

-DECLARE_DYNAMIC_CLASS(wxButton)
-

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

-    wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxButtonNameStr)
+    wxButton(wxWindow *parent,
+             wxWindowID id,
+             const wxString& label,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxButtonNameStr)

     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
 
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
 

-    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxButtonNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxButtonNameStr);

 
     virtual ~wxButton();
 
 
     virtual ~wxButton();
 


@@ -51,21 +51,43 @@ public:
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
 
     // 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);
     virtual bool MSWCommand(WXUINT param, WXWORD id);

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC,
-                                WXHWND pWnd,
-                                WXUINT nCtlColor,
-                                WXUINT message,
-                                WXWPARAM wParam,
-                                WXLPARAM lParam);
+
+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+    {
+        // avoide switching into owner-drawn mode
+        wxControl::SetBackgroundColour(bg);
+    }
+    
+#ifdef __WIN32__
+    // coloured buttons support
+    virtual bool SetBackgroundColour(const wxColour &colour);
+    virtual bool SetForegroundColour(const wxColour &colour);
+
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+
+private:
+    void MakeOwnerDrawn();
+#endif // __WIN32__

 
 protected:
     // send a notification event, return TRUE if processed
     bool SendClickEvent();
 
 
 protected:
     // send a notification event, return TRUE if processed
     bool SendClickEvent();
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    // default button handling
+    void SetTmpDefault();
+    void UnsetTmpDefault();
+
+    // set or unset BS_DEFPUSHBUTTON style
+    static void SetDefaultStyle(wxButton *btn, bool on);
+
+    // usually overridden base class virtuals
+    virtual wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)

 };
 
 #endif
 };
 
 #endif