Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index e3669c8c0803979c768a84c95746041abc8faae9..29897ad9c336abb1172aedf22243c864c4d664cd 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Purpose:     wxControl class
 // 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
 /////////////////////////////////////////////////////////////////////////////


@@ -12,14 +11,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 +34,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,17 +54,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; }
 
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 

-    virtual WXHBRUSH MSWControlColor(WXHDC pDC);
+    // default handling of WM_CTLCOLORxxx: this is public so that wxWindow
+    // could call it
+    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


@@ -83,7 +80,7 @@ protected:
     // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
     // WinCE of Smartphones this happens also for native wxTextCtrl,
     // wxChoice and others.
     // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
     // WinCE of Smartphones this happens also for native wxTextCtrl,
     // wxChoice and others.

-    virtual wxSize GetBestSpinerSize(const bool is_vertical) const;
+    virtual wxSize GetBestSpinnerSize(const bool is_vertical) const;

 
     // create the control of the given Windows class: this is typically called
     // from Create() method of the derived class passing its label, pos and
 
     // create the control of the given Windows class: this is typically called
     // from Create() method of the derived class passing its label, pos and


@@ -115,15 +112,14 @@ 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);

 
 

-    // 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);
+    // 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, 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