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

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index f3f1e696b90b1dc6ba5adaa9670a3ce4f3704563..9047d9bd7cd68b2ffe878153aa57c69e6a8ad160 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -22,6 +22,8 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
 
 #ifndef WX_PRECOMP
 #include <stdio.h>

+#include <wx/utils.h>
+#include <wx/brush.h>

 #endif
 
 #ifdef __WIN95__
 #endif
 
 #ifdef __WIN95__


@@ -36,11 +38,11 @@
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
 

-#if WXWIN_COMPATIBILITY

 BEGIN_EVENT_TABLE(wxSlider95, wxControl)
 BEGIN_EVENT_TABLE(wxSlider95, wxControl)

+#if WXWIN_COMPATIBILITY

   EVT_SCROLL(wxSlider95::OnScroll)
   EVT_SCROLL(wxSlider95::OnScroll)

-END_EVENT_TABLE()

 #endif
 #endif

+END_EVENT_TABLE()

 
 #endif
 
 
 #endif
 


@@ -68,8 +70,8 @@ bool wxSlider95::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;


@@ -154,6 +156,10 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
   SubclassWin(GetHWND());
 
 
   SubclassWin(GetHWND());
 

+  SetWindowText((HWND) m_hWnd, "");
+
+  SetFont(parent->GetFont());
+

   if ( m_windowStyle & wxSL_LABELS )
   {
       // Finally, create max value static item
   if ( m_windowStyle & wxSL_LABELS )
   {
       // Finally, create max value static item


@@ -163,22 +169,20 @@ bool wxSlider95::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());

 
 

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

       {
       {

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

         }
       }
   }
         }
       }
   }


@@ -328,6 +332,15 @@ void wxSlider95::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;
 }


@@ -346,6 +359,8 @@ void wxSlider95::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;


@@ -355,7 +370,7 @@ void wxSlider95::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)
   {


@@ -364,12 +379,12 @@ void wxSlider95::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));


@@ -407,6 +422,11 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
        else
        {
                // No labels
        else
        {
                // No labels

+               // If we're prepared to use the existing size, then...
+               if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+               {
+                       GetSize(&w1, &h1);
+               }

                if ( w1 < 0 )
                        w1 = 200;
                if ( h1 < 0 )
                if ( w1 < 0 )
                        w1 = 200;
                if ( h1 < 0 )


@@ -420,11 +440,11 @@ void wxSlider95::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)
     {


@@ -468,6 +488,11 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
        else
        {
                // No labels
        else
        {
                // No labels

+               // If we're prepared to use the existing size, then...
+               if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+               {
+                       GetSize(&w1, &h1);
+               }

                if ( w1 < 0 )
                        w1 = 20;
                if ( h1 < 0 )
                if ( w1 < 0 )
                        w1 = 20;
                if ( h1 < 0 )