cleanup - added whitespace around operators, some blank lines, fixed comment typos...

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

diff --git a/include/wx/palmos/button.h b/include/wx/palmos/button.h
index 07f4ed15f907ca4abba4917ef33b2452848daef7..cc45441469a2433203b5fd04a247b2298954edea 100644 (file)
--- a/include/wx/palmos/button.h
+++ b/include/wx/palmos/button.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/button.h
 // Purpose:     wxButton class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/button.h
 // Purpose:     wxButton class

-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Wlodzimierz ABX Skiba - native wxButton implementation

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id: 
-// Copyright:   (c) William Osborne
+// RCS-ID:      $Id$
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-

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


@@ -26,7 +22,7 @@ public:
     wxButton() { }
     wxButton(wxWindow *parent,
              wxWindowID id,
     wxButton() { }
     wxButton(wxWindow *parent,
              wxWindowID id,

-             const wxString& label,
+             const wxString& label = wxEmptyString,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,


@@ -51,29 +47,11 @@ 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 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__
+    // send a notification event, return true if processed
+    bool SendClickEvent();

 
 protected:
 
 protected:

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

 
     // default button handling
     void SetTmpDefault();
 
     // default button handling
     void SetTmpDefault();


@@ -84,7 +62,6 @@ protected:
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)