gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index d4e85575e9daaaea76a03c2780f4c8a5b5de9633..0b0476844ec5222790f6a476c471f60b30eeef3b 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_


@@ -17,11 +17,13 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

-#include "wx/gdicmn.h"

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 

+// ----------------------------------------------------------------------------

 // Pushbutton
 // Pushbutton

+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxButton : public wxControl
 {
 DECLARE_DYNAMIC_CLASS(wxButton)
 class WXDLLEXPORT wxButton : public wxControl
 {
 DECLARE_DYNAMIC_CLASS(wxButton)


@@ -43,18 +45,33 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxButtonNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxButtonNameStr);
 

+    virtual ~wxButton();
+

     virtual void SetDefault();
     virtual void SetDefault();

-    virtual void SetLabel(const wxString& label);
-    virtual wxString GetLabel() const ;
+
+    static wxSize GetDefaultSize();
+
+    // implementation from now on

     virtual void Command(wxCommandEvent& event);
     virtual void Command(wxCommandEvent& event);

+    virtual long 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);
+
+#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:
 
 protected:

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    // send a notification event, return TRUE if processed
+    bool SendClickEvent();
+
+    virtual wxSize DoGetBestSize() const;

 };
 
 #endif
 };
 
 #endif