Reuse wxMessageOutputStderr for wxLogStderr implementation.

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index a917a0e4496ed276b479d4403856d8a948b7cbaa..01d09f4832b5c3c7741bfc09b3ddad9edc51e88a 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.h
+// Name:        wx/msw/control.h

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:


@@ -12,14 +12,10 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "control.h"
-#endif
-

 #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() { }


@@ -39,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); }


@@ -60,19 +55,20 @@ public:
     bool ProcessCommand(wxCommandEvent& event);
 
     // MSW-specific
     bool ProcessCommand(wxCommandEvent& event);
 
     // MSW-specific

-#ifdef __WIN95__

     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

-#endif // Win95

 
     // For ownerdraw items
 
     // 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; }
 
     // default handling of WM_CTLCOLORxxx: this is public so that wxWindow
     // could call it
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
     // default handling of WM_CTLCOLORxxx: this is public so that wxWindow
     // could call it

-    virtual WXHBRUSH MSWControlColor(WXHDC pDC);
+    virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd);
+
+    // default style for the control include WS_TABSTOP if it AcceptsFocus()
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 protected:
     // choose the default border for this window
 
 protected:
     // choose the default border for this window


@@ -117,9 +113,6 @@ protected:
                           const wxString& label = wxEmptyString,
                           WXDWORD exstyle = (WXDWORD)-1);
 
                           const wxString& label = wxEmptyString,
                           WXDWORD exstyle = (WXDWORD)-1);
 

-    // default style for the control include WS_TABSTOP if it AcceptsFocus()
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-

     // call this from the derived class MSWControlColor() if you want to show
     // the control greyed out (and opaque)
     WXHBRUSH MSWControlColorDisabled(WXHDC pDC);
     // call this from the derived class MSWControlColor() if you want to show
     // the control greyed out (and opaque)
     WXHBRUSH MSWControlColorDisabled(WXHDC pDC);


@@ -127,14 +120,7 @@ protected:
     // common part of the 3 functions above: pass wxNullColour to use the
     // appropriate background colour (meaning ours or our parents) or a fixed
     // one
     // common part of the 3 functions above: pass wxNullColour to use the
     // appropriate background colour (meaning ours or our parents) or a fixed
     // one

-    virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg);
-
-    // 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);
+    virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);

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