Source cleaning: whitespaces & tabs, ::, TRUE/true, FALSE/false.

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 09614dc3c10d5d4408217e986502c301a344a146..16171921737764b62c1e9c797c84f2c1d0bd0fdd 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -14,61 +14,103 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-

 // Pushbutton
 // Pushbutton

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxButton)

  public:
  public:

-  inline wxButton() {}
-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+    inline wxButton() {}
+    inline wxButton( wxWindow*          pParent
+                    ,wxWindowID         vId
+                    ,const wxString&    rsLabel
+                    ,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
+              );
+    }
+    
+    wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock,
+           const wxString& descriptiveLabel = wxEmptyString,

            const wxPoint& pos = wxDefaultPosition,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
+           long style = 0,

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

-#  endif
-#endif

            const wxString& name = wxButtonNameStr)
            const wxString& name = wxButtonNameStr)

-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+    {
+        Create(parent, id, stock, descriptiveLabel, pos, style, validator, name);
+    }

 
 

-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxString&    rsLabel
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = 0
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxButtonNameStr
+               );
+    
+    bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
+           const wxString& descriptiveLabel = wxEmptyString,

            const wxPoint& pos = wxDefaultPosition,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
+           long style = 0,

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

-#  endif
-#endif
-           const wxString& name = wxButtonNameStr);
+           const wxString& name = wxButtonNameStr)
+    {
+        return CreateStock(parent, id, stock, descriptiveLabel,
+                           pos, style, validator, name);
+    }

 
 

-  virtual ~wxButton();
+    virtual ~wxButton();

 
 

-  virtual void SetDefault();
+    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);

 
 

-  static wxSize GetDefaultSize();
+    virtual MRESULT WindowProc( WXUINT   uMsg
+                               ,WXWPARAM wParam
+                               ,WXLPARAM lParam
+                              );

 
 

-  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:
 protected:

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

 
 

-    virtual wxSize DoGetBestSize();
-};
+    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_
 
 #endif
     // _WX_BUTTON_H_

+