Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 70f51f6fa5fede77054924b07612e1cfceaec609..26979a8939615b000e94984831919c66c3c063dc 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -4,41 +4,38 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_BUTTON_H_
-#define _WX_BUTTON_H_
-
-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
+#ifndef _WX_MSW_BUTTON_H_
+#define _WX_MSW_BUTTON_H_

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

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

 {
 public:
 {
 public:

-    wxButton() { }
+    wxButton() { Init(); }

     wxButton(wxWindow *parent,
              wxWindowID id,
     wxButton(wxWindow *parent,
              wxWindowID id,

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

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {

+        Init();
+

         Create(parent, id, label, pos, size, style, validator, name);
     }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
         Create(parent, id, label, pos, size, style, validator, name);
     }
 
     bool Create(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,35 +44,42 @@ 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 long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 

-#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__
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 protected:
 
 protected:

-    // send a notification event, return TRUE if processed
+    // send a notification event, return true if processed

     bool SendClickEvent();
 
     bool SendClickEvent();
 

-    // usually overridden base class virtuals
-    virtual wxSize DoGetBestSize() const;
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    // default button handling
+    void SetTmpDefault();
+    void UnsetTmpDefault();
+
+    // set or unset BS_DEFPUSHBUTTON style
+    static void SetDefaultStyle(wxButton *btn, bool on);
+
+    virtual bool DoGetAuthNeeded() const;
+    virtual void DoSetAuthNeeded(bool show);
+
+    // true if the UAC symbol is shown
+    bool m_authNeeded;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxButton)
+    void Init()
+    {
+        m_authNeeded = false;
+    }
+
+    void OnCharHook(wxKeyEvent& event);
+
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);

 };
 
 };
 

-#endif
-    // _WX_BUTTON_H_
+#endif // _WX_MSW_BUTTON_H_