catches program exceptions in release build (VC++ only)

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 63d743e66c518824fd9661d7642fa94b89a0158a..452f520fa6f36caf5daeb99ab27e09bfd6c9fb75 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #endif
 
 #include <stdio.h>
 #endif
 

+#include "wx/utils.h"
+#include "wx/brush.h"

 #include "wx/msw/slidrmsw.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/slidrmsw.h"
 #include "wx/msw/private.h"
 


@@ -62,8 +64,8 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   SetValidator(validator);
 
   if (parent) parent->AddChild(this);
   SetValidator(validator);
 
   if (parent) parent->AddChild(this);

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;

 
   m_staticValue = 0;
   m_staticMin = 0;
 
   m_staticValue = 0;
   m_staticMin = 0;


@@ -136,22 +138,22 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
 

-  if (GetFont())
+  if (GetFont().Ok())

   {
 //    GetFont()->RealizeResource();
   {
 //    GetFont()->RealizeResource();

-    if (GetFont()->GetResourceHandle())
+    if (GetFont().GetResourceHandle())

     {
                if ( m_staticMin )
                SendMessage((HWND)m_staticMin,WM_SETFONT,
     {
                if ( m_staticMin )
                SendMessage((HWND)m_staticMin,WM_SETFONT,

-                       (WPARAM)GetFont()->GetResourceHandle(),0L);
+                       (WPARAM)GetFont().GetResourceHandle(),0L);

                if ( m_staticMax )
                SendMessage((HWND)m_staticMax,WM_SETFONT,
                if ( m_staticMax )
                SendMessage((HWND)m_staticMax,WM_SETFONT,

-                  (WPARAM)GetFont()->GetResourceHandle(),0L);
+                  (WPARAM)GetFont().GetResourceHandle(),0L);

        if (m_staticValue)
                SendMessage((HWND)m_staticValue,WM_SETFONT,
        if (m_staticValue)
                SendMessage((HWND)m_staticValue,WM_SETFONT,

-                    (WPARAM)GetFont()->GetResourceHandle(),0L);
+                    (WPARAM)GetFont().GetResourceHandle(),0L);

     }
   }
 
     }
   }
 


@@ -302,6 +304,15 @@ void wxSliderMSW::GetPosition(int *x, int *y) const
   if (parent)
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
 
   if (parent)
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
 

+  // We may be faking the client origin.
+  // So a window that's really at (0, 30) may appear
+  // (to wxWin apps) to be at (0, 0).
+  if (GetParent())
+  {
+    wxPoint pt(GetParent()->GetClientAreaOrigin());
+    point.x -= pt.x;
+    point.y -= pt.y;
+  }

   *x = point.x;
   *y = point.y;
 }
   *x = point.x;
   *y = point.y;
 }


@@ -320,6 +331,8 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 

+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+

   char buf[300];
 
   int x_offset = x;
   char buf[300];
 
   int x_offset = x;


@@ -329,7 +342,7 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cy;
   int cyf;
 
   int cy;
   int cyf;
 

-  wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy,& GetFont());

 
   if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
   {
 
   if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
   {


@@ -338,12 +351,12 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
     int min_len = 0;
 
     GetWindowText((HWND) m_staticMin, buf, 300);
     int min_len = 0;
 
     GetWindowText((HWND) m_staticMin, buf, 300);

-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & GetFont());

 
     int max_len = 0;
 
     GetWindowText((HWND) m_staticMax, buf, 300);
 
     int max_len = 0;
 
     GetWindowText((HWND) m_staticMax, buf, 300);

-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & GetFont());

     if (m_staticValue)
     {
       int new_width = (int)(wxMax(min_len, max_len));
     if (m_staticValue)
     {
       int new_width = (int)(wxMax(min_len, max_len));


@@ -389,11 +402,11 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
        {
     int min_len;
     GetWindowText((HWND) m_staticMin, buf, 300);
        {
     int min_len;
     GetWindowText((HWND) m_staticMin, buf, 300);

-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL,GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL,& GetFont());

 
     int max_len;
     GetWindowText((HWND) m_staticMax, buf, 300);
 
     int max_len;
     GetWindowText((HWND) m_staticMax, buf, 300);

-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & GetFont());

 
     if (m_staticValue)
     {
 
     if (m_staticValue)
     {