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

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index e5b8dc9b9f875735d6e13c3a3c33c52823fcf8bd..01d09f4832b5c3c7741bfc09b3ddad9edc51e88a 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -15,7 +15,7 @@
 #include "wx/dynarray.h"
 
 // General item class
 #include "wx/dynarray.h"
 
 // General item class

-class WXDLLEXPORT wxControl : public wxControlBase
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase

 {
 public:
     wxControl() { }
 {
 public:
     wxControl() { }


@@ -35,7 +35,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 

-    virtual ~wxControl();

 
     // Simulates an event
     virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
 
     // Simulates an event
     virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }


@@ -59,8 +58,8 @@ public:
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     // For ownerdraw items
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     // For ownerdraw items

-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; };
-    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; };
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }
+    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; }

 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 


@@ -123,13 +122,6 @@ protected:
     // one
     virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
 
     // one
     virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
 

-    // this is a helper for the derived class GetClassDefaultAttributes()
-    // implementation: it returns the right colours for the classes which
-    // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of
-    // being simple controls (such as wxButton, wxCheckBox, ...)
-    static wxVisualAttributes
-        GetCompositeControlsDefaultAttributes(wxWindowVariant variant);
-

     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;
     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;