When handling accelerators in wxWebView make sure that we do not block right-alt...

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 1ee21c4d1e27d4822580c37159386e7b5e9f88e8..d1f4c4e36474ec97af0b0aec2aa2edccb0149a26 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_BUTTON_H_
-#define _WX_BUTTON_H_
+#ifndef _WX_MSW_BUTTON_H_
+#define _WX_MSW_BUTTON_H_

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


@@ -19,7 +19,7 @@
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:

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

     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxString& label = wxEmptyString,
     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxString& label = wxEmptyString,


@@ -29,6 +29,8 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {

+        Init();
+

         Create(parent, id, label, pos, size, style, validator, name);
     }
 
         Create(parent, id, label, pos, size, style, validator, name);
     }
 


@@ -45,25 +47,13 @@ public:
 
     virtual wxWindow *SetDefault();
 
 
     virtual wxWindow *SetDefault();
 

-    // overridden base class methods
-    virtual void SetLabel(const wxString& label);
-    virtual bool SetBackgroundColour(const wxColour &colour);
-    virtual bool SetForegroundColour(const wxColour &colour);
-

     // 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);
 
     // 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 bool MSWOnDraw(WXDRAWITEMSTRUCT *item);

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

-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-private:
-    void MakeOwnerDrawn();
-

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


@@ -75,11 +65,22 @@ protected:
     // set or unset BS_DEFPUSHBUTTON style
     static void SetDefaultStyle(wxButton *btn, bool on);
 
     // set or unset BS_DEFPUSHBUTTON style
     static void SetDefaultStyle(wxButton *btn, bool on);
 

-    // usually overridden base class virtuals
-    virtual wxSize DoGetBestSize() const;
+    virtual bool DoGetAuthNeeded() const;
+    virtual void DoSetAuthNeeded(bool show);
+
+    // true if the UAC symbol is shown
+    bool m_authNeeded;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(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_