Better fix

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

diff --git a/include/wx/palmos/button.h b/include/wx/palmos/button.h
index a34f5a45c27eb8c0e92d886062eb6709ba55ebd1..4c1118b475b011c347f26969d0c90b4ecb19deff 100644 (file)
--- a/include/wx/palmos/button.h
+++ b/include/wx/palmos/button.h
@@ -2,20 +2,16 @@
 // Name:        wx/palmos/button.h
 // Purpose:     wxButton class
 // Author:      William Osborne - minimal working wxPalmOS port
-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native wxButton implementation
 // Created:     10/13/04
 // RCS-ID:      $Id$
-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // Pushbutton
 // ----------------------------------------------------------------------------
@@ -26,7 +22,7 @@ public:
     wxButton() { }
     wxButton(wxWindow *parent,
              wxWindowID id,
-             const wxString& label,
+             const wxString& label = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
@@ -47,23 +43,16 @@ public:
 
     virtual ~wxButton();
 
-    virtual void SetDefault();
+    virtual wxWindow *SetDefault();
 
     // 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);
-    }
 
-protected:
     // send a notification event, return true if processed
     bool SendClickEvent();
 
+protected:
+
     // default button handling
     void SetTmpDefault();
     void UnsetTmpDefault();
@@ -73,7 +62,6 @@ protected:
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)