various cleanups

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 0aad8787d239f383c90c98cd15aa198a6a104c82..09e384bc7ad5b6945a3b480e8a668dfb8524fef4 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slidrmsw.h"
 #endif
 
 #pragma implementation "slidrmsw.h"
 #endif
 


@@ -50,6 +50,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_NONE;
+

   SetName(name);
 #if wxUSE_VALIDATORS
   SetValidator(validator);
   SetName(name);
 #if wxUSE_VALIDATORS
   SetValidator(validator);


@@ -66,7 +69,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   m_lineSize = 1;
   m_windowStyle = style;
 
   m_lineSize = 1;
   m_windowStyle = style;
 

-  if ( id == -1 )
+  if ( id == wxID_ANY )

       m_windowId = (int)NewControlId();
   else
     m_windowId = id;
       m_windowId = (int)NewControlId();
   else
     m_windowId = id;


@@ -77,10 +80,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   // non-Win95 implementation
   int height = size.y;
 
   // non-Win95 implementation

-  
+

   long msStyle = SS_CENTER;
 
   long msStyle = SS_CENTER;
 

- // WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;

   WXDWORD exStyle = 0;
   msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
 
   WXDWORD exStyle = 0;
   msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
 


@@ -106,7 +108,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 

-  HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxT(""),
+  HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString,

                          msStyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
                          msStyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);


@@ -156,7 +158,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   SetSize(x, y, width, height);
   SetValue(value);
 
   SetSize(x, y, width, height);
   SetValue(value);
 

-  return TRUE;
+  return true;

 }
 
 bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 }
 
 bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,


@@ -215,7 +217,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     if (nScrollInc == 0)
     {
         // no event...
     if (nScrollInc == 0)
     {
         // no event...

-        return FALSE;
+        return false;

     }
 
     int newPos = position + nScrollInc;
     }
 
     int newPos = position + nScrollInc;


@@ -223,7 +225,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it
     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it

-        return TRUE;
+        return true;

     }
 
     SetValue(newPos);
     }
 
     SetValue(newPos);


@@ -331,9 +333,9 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);

-  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     x1 = currentX;
     x1 = currentX;

-  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     y1 = currentY;
 
   AdjustForParentClientOrigin(x1, y1, sizeFlags);
     y1 = currentY;
 
   AdjustForParentClientOrigin(x1, y1, sizeFlags);


@@ -347,7 +349,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
   int cy;
   int cyf;
 
   int cy;
   int cyf;
 

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

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


@@ -371,11 +373,11 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
       // a lot of space before the first character
       new_width += 3*cx;
 #endif
       // a lot of space before the first character
       new_width += 3*cx;
 #endif

-      MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
+      ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);

       x_offset += new_width + cx;
     }
 
       x_offset += new_width + cx;
     }
 

-    MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);

     x_offset += (int)(min_len + cx);
 
     int slider_length = (int)(w1 - x_offset - max_len - cx);
     x_offset += (int)(min_len + cx);
 
     int slider_length = (int)(w1 - x_offset - max_len - cx);


@@ -386,10 +388,10 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE);
+    ::MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE);

     x_offset += slider_length + cx;
 
     x_offset += slider_length + cx;
 

-    MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);

     }
     else
     {
     }
     else
     {


@@ -398,7 +400,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             w1 = 200;
         if ( h1 < 0 )
             h1 = 20;
             w1 = 200;
         if ( h1 < 0 )
             h1 = 20;

-        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+        ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);

     }
   }
   else
     }
   }
   else


@@ -426,11 +428,11 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
  ... and replace with following line: */
       new_width += cx;
 
  ... and replace with following line: */
       new_width += cx;
 

-      MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
+      ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);

       y_offset += valueHeight;
     }
 
       y_offset += valueHeight;
     }
 

-    MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);

     y_offset += cy;
 
     int slider_length = (int)(h1 - y_offset - cy - cy);
     y_offset += cy;
 
     int slider_length = (int)(h1 - y_offset - cy - cy);


@@ -442,10 +444,10 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE);
+    ::MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE);

     y_offset += slider_length;
 
     y_offset += slider_length;
 

-    MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);

     }
     else
     {
     }
     else
     {


@@ -454,7 +456,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             w1 = 20;
         if ( h1 < 0 )
             h1 = 200;
             w1 = 20;
         if ( h1 < 0 )
             h1 = 200;

-        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+        ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);

     }
   }
 }
     }
   }
 }


@@ -547,7 +549,7 @@ bool wxSliderMSW::Show(bool show)
         ShowWindow((HWND) m_staticMin, (BOOL)cshow);
     if(m_staticMax)
         ShowWindow((HWND) m_staticMax, (BOOL)cshow);
         ShowWindow((HWND) m_staticMin, (BOOL)cshow);
     if(m_staticMax)
         ShowWindow((HWND) m_staticMax, (BOOL)cshow);

-    return TRUE;
+    return true;

 }
 
 
 }