added wxListView class: this is going to be a wxListCtrl with human (inter)face

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index ce7b2fca18b6f4c5dfca6a4d06a4ce56bace7879..75047d806dc84e23ac54d865daee275822f30c67 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.cpp
+// Name:        msw/control.cpp

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


@@ -10,27 +10,30 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "control.h"
+    #pragma implementation "control.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_CONTROLS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/control.h"
 
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/control.h"
 
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 


@@ -79,9 +82,11 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  WXDWORD exstyle)
 {
                                  const wxString& label,
                                  WXDWORD exstyle)
 {

-    // VZ: if someone could put a comment here explaining what exactly this is
-    //     needed for, it would be nice...
-    bool want3D;
+    // want3D tells us whether or not the style specified a 3D border.
+    // If so, under WIN16 we can use Ctl3D to give it an appropriate style.
+    // Sometimes want3D is used to indicate that the non-extended style should have
+    // WS_BORDER.
+    bool want3D = TRUE;

 
     // if no extended style given, determine it ourselves
     if ( exstyle == (WXDWORD)-1 )
 
     // if no extended style given, determine it ourselves
     if ( exstyle == (WXDWORD)-1 )


@@ -89,7 +94,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         exstyle = GetExStyle(style, &want3D);
     }
 
         exstyle = GetExStyle(style, &want3D);
     }
 

-    // all controls have these childs (wxWindows creates all controls visible
+    // all controls have these styles (wxWindows creates all controls visible

     // by default)
     style |= WS_CHILD | WS_VISIBLE;
 
     // by default)
     style |= WS_CHILD | WS_VISIBLE;
 


@@ -109,9 +114,8 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 
     if ( !m_hWnd )
     {
 
     if ( !m_hWnd )
     {

-#ifdef __WXDEBUG__
-        wxLogError(wxT("Failed to create a control of class '%s'"), classname);
-#endif // DEBUG
+        wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
+        wxFAIL_MSG(_T("something is very wrong"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -143,7 +147,7 @@ bool wxControl::ProcessCommand(wxCommandEvent& event)
 #if WXWIN_COMPATIBILITY
     if ( m_callback )
     {
 #if WXWIN_COMPATIBILITY
     if ( m_callback )
     {

-        (void)(*m_callback)(this, event);
+        (void)(*m_callback)(*this, event);

 
         return TRUE;
     }
 
         return TRUE;
     }


@@ -221,10 +225,17 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
     ::SetMapMode(hdc, mode);
 }
 
     ::SetMapMode(hdc, mode);
 }
 

-WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+#if wxUSE_CTL3D

                                WXUINT message,
                                WXWPARAM wParam,
                                WXUINT message,
                                WXWPARAM wParam,

-                               WXLPARAM lParam)
+                               WXLPARAM lParam
+#else
+                               WXUINT WXUNUSED(message),
+                               WXWPARAM WXUNUSED(wParam),
+                               WXLPARAM WXUNUSED(lParam)
+#endif
+    )

 {
 #if wxUSE_CTL3D
     if ( m_useCtl3D )
 {
 #if wxUSE_CTL3D
     if ( m_useCtl3D )


@@ -240,7 +251,8 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     else
         SetBkMode(hdc, OPAQUE);
 
     else
         SetBkMode(hdc, OPAQUE);
 

-    const wxColour& colBack = GetBackgroundColour();
+    wxColour colBack = GetBackgroundColour();
+

     ::SetBkColor(hdc, wxColourToRGB(colBack));
     ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
 
     ::SetBkColor(hdc, wxColourToRGB(colBack));
     ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
 


@@ -295,3 +307,4 @@ void wxFindMaxSize(WXHWND wnd, RECT *rect)
         rect->bottom = bottom;
 }
 
         rect->bottom = bottom;
 }
 

+#endif // wxUSE_CONTROLS