Get rid of the CVS merge characters that have worked their way into this causing...

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index ea72d9e9f3b5726f0757d8d46c57626b9995d4f4..fd82221246087afa56984d9b2a196b6826d40218 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -24,14 +24,15 @@
 #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__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+    #include <commctrl.h>

 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)


@@ -79,9 +80,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 +92,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 +112,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 +145,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;
     }


@@ -204,10 +206,9 @@ bool wxControl::MSWOnNotify(int idCtrl,
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {

-    // In general, you don't want to erase the background of a control,
-    // or you'll get a flicker.
-    // TODO: move this 'null' function into each control that
-    // might flicker.
+    // notice that this 'dumb' implementation may cause flicker for some of the
+    // controls in which case they should intercept wxEraseEvent and process it
+    // themselves somehow

 
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);
 
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);


@@ -222,10 +223,10 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
     ::SetMapMode(hdc, mode);
 }
 
     ::SetMapMode(hdc, mode);
 }
 

-WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                               WXUINT message,
-                               WXWPARAM wParam,
-                               WXLPARAM lParam)
+WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+                               WXUINT WXUNUSED(message),
+                               WXWPARAM WXUNUSED(wParam),
+                               WXLPARAM WXUNUSED(lParam))

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


@@ -241,7 +242,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()));