cleanup - fixed warnings, reformatting

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 68b67d8c96ff370f261b924f60bbf9041712a222..272bb088992c72321f8de526ed987da7e9e74419 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -1,53 +1,95 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.h
 // Purpose:     wxButton class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/13/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
-
 #include "wx/control.h"
-#include "wx/gdicmn.h"
-
-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,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      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);
-
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual void SetDefault();
-  virtual void SetLabel(const wxString& label);
-  virtual wxString GetLabel() const ;
-  virtual void Command(wxCommandEvent& event);
-};
+    inline wxButton() {}
+    inline wxButton( wxWindow*          pParent
+                    ,wxWindowID         vId
+                    ,const wxString&    rsLabel = wxEmptyString
+                    ,const wxPoint&     rPos = wxDefaultPosition
+                    ,const wxSize&      rSize = wxDefaultSize
+                    ,long               lStyle = 0
+                    ,const wxValidator& rValidator = wxDefaultValidator
+                    ,const wxString&    rsName = wxButtonNameStr
+                   )
+    {
+        Create( pParent
+               ,vId
+               ,rsLabel
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
+
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxString&    rsLabel = wxEmptyString
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = 0
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxButtonNameStr
+               );
+    
+    virtual ~wxButton();
+
+    virtual void     SetDefault(void);
+    static wxSize    GetDefaultSize(void);
+    virtual void     Command(wxCommandEvent& rEvent);
+    virtual bool     OS2Command( WXUINT uParam
+                                ,WXWORD vId
+                               );
+    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
+                                ,WXHWND   hWnd
+                                ,WXUINT   uCtlColor
+                                ,WXUINT   uMessage
+                                ,WXWPARAM wParam
+                                ,WXLPARAM lParam
+                               );
+    void          MakeOwnerDrawn(void);
+
+    virtual MRESULT WindowProc( WXUINT   uMsg
+                               ,WXWPARAM wParam
+                               ,WXLPARAM lParam
+                              );
+
+protected:
+
+    bool            SendClickEvent(void);
+    void            SetTmpDefault(void);
+    void            UnsetTmpDefault(void);
+
+    static void     SetDefaultStyle( wxButton* pButton
+                                    ,bool      bOn
+                                   );
+
+    virtual wxSize  DoGetBestSize(void) const;
+    virtual WXDWORD OS2GetStyle( long     style
+                                ,WXDWORD* exstyle
+                               ) const;
+private:
+  DECLARE_DYNAMIC_CLASS(wxButton)
+}; // end of CLASS wxButton
 
 #endif
     // _WX_BUTTON_H_
+