another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/include/wx/palmos/button.h b/include/wx/palmos/button.h
index 73c7c977507089c9fefebd1ab9607ca771f1c3ca..1c6d30cf212a82f4b26de42761f042e058d181ce 100644 (file)
--- a/include/wx/palmos/button.h
+++ b/include/wx/palmos/button.h
@@ -1,32 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxButton() { }
     wxButton(wxWindow *parent,
              wxWindowID id,
 {
 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,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,


@@ -47,23 +43,16 @@ public:
 
     virtual ~wxButton();
 
 
     virtual ~wxButton();
 

-    virtual void SetDefault();
+    virtual wxWindow *SetDefault();

 
     // 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);
-    }

 
 

-protected:

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

+protected:
+

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


@@ -73,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)