implemented (untested) work around for wxScrolledWindow painting bug

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index a7dee7609e35df83cb57707c61cca7b5c00c95a8..5330bcfb8f12878206c5195e52e158c714c4bbbe 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -1,36 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.h
 // Purpose:     wxButton class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.h
 // Purpose:     wxButton class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
-

 #include "wx/control.h"
 #include "wx/control.h"

-#include "wx/gdicmn.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton
 
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxButton)

  public:
   inline wxButton() {}
   inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
  public:
   inline wxButton() {}
   inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,

+#if wxUSE_VALIDATORS

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

+#endif

            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);


@@ -39,19 +35,32 @@ class WXDLLEXPORT wxButton: public wxControl
   bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
   bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,

+#if wxUSE_VALIDATORS

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

+#endif

            const wxString& name = wxButtonNameStr);
 
   virtual ~wxButton();
 
            const wxString& name = wxButtonNameStr);
 
   virtual ~wxButton();
 

-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

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

-  virtual void SetLabel(const wxString& label);
-  virtual wxString GetLabel() const ;

 
   static wxSize GetDefaultSize();
 
   virtual void Command(wxCommandEvent& event);
 
   static wxSize GetDefaultSize();
 
   virtual void Command(wxCommandEvent& event);

+  virtual bool OS2Command(WXUINT param, WXWORD id);
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC,
+                              WXHWND pWnd,
+                              WXUINT nCtlColor,
+                              WXUINT message,
+                              WXWPARAM wParam,
+                              WXLPARAM lParam);
+protected:
+    // send a notification event, return TRUE if processed
+    bool SendClickEvent();
+
+    virtual wxSize DoGetBestSize() const;
+private:
+  DECLARE_DYNAMIC_CLASS(wxButton)

 };
 
 #endif
 };
 
 #endif