crash in GTK 1.0 on multiline text ctrl creation fixed

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

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index 2edc0586e2a42f519a40ecbed07f3b6c04f0b3d3..c2137dd8c489e77a418d624c6c3329f26f9e35b7 100644 (file)
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -22,9 +22,10 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"

+#include "wx/utils.h"

 #endif
 
 #endif
 

-#if USE_GAUGE 
+#if wxUSE_GAUGE 

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


@@ -63,11 +64,11 @@ BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance);
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)
 #endif
 

-bool wxGaugeMSW::Create(wxWindow *parent, const wxWindowID id,
-           const int range,
+bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
+           int range,

            const wxPoint& pos,
            const wxSize& size,
            const wxPoint& pos,
            const wxSize& size,

-           const long style,
+           long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {


@@ -75,7 +76,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, const wxWindowID id,
 
   if ( !wxGaugeMSWInitialised )
   {
 
   if ( !wxGaugeMSWInitialised )
   {

-    if (!gaugeInit((HWND) wxGetInstance()))
+    if (!gaugeInit((HINSTANCE) wxGetInstance()))

        wxFatalError("Cannot initalize Gauge library");
        wxGaugeMSWInitialised = TRUE;
   }
        wxFatalError("Cannot initalize Gauge library");
        wxGaugeMSWInitialised = TRUE;
   }


@@ -85,9 +86,10 @@ bool wxGaugeMSW::Create(wxWindow *parent, const wxWindowID id,
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;

+  m_gaugePos = 0;

 
 

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

 
   m_windowStyle = style;
 
 
   m_windowStyle = style;
 


@@ -127,7 +129,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, const wxWindowID id,
   SendMessage((HWND) GetHWND(), ZYZG_SETFGCOLOR, 0, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
   SendMessage((HWND) GetHWND(), ZYZG_SETBKCOLOR, 0, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
 
   SendMessage((HWND) GetHWND(), ZYZG_SETFGCOLOR, 0, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
   SendMessage((HWND) GetHWND(), ZYZG_SETBKCOLOR, 0, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
 

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

 
   if (width == -1)
     width = 50;
 
   if (width == -1)
     width = 50;


@@ -140,7 +142,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, const wxWindowID id,
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxGaugeMSW::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxGaugeMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -154,6 +156,8 @@ void wxGaugeMSW::SetSize(const int x, const int y, const int width, const int he
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 

+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+

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


@@ -168,34 +172,26 @@ void wxGaugeMSW::SetSize(const int x, const int y, const int width, const int he
     h1 = DEFAULT_ITEM_HEIGHT;
 
   MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
     h1 = DEFAULT_ITEM_HEIGHT;
 
   MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);

-
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else
-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-#endif

 }
 
 }
 

-void wxGaugeMSW::SetShadowWidth(const int w)
+void wxGaugeMSW::SetShadowWidth(int w)

 {
   SendMessage((HWND) GetHWND(), ZYZG_SETWIDTH3D, w, 0);
 }
 
 {
   SendMessage((HWND) GetHWND(), ZYZG_SETWIDTH3D, w, 0);
 }
 

-void wxGaugeMSW::SetBezelFace(const int w)
+void wxGaugeMSW::SetBezelFace(int w)

 {
   SendMessage((HWND) GetHWND(), ZYZG_SETBEZELFACE, w, 0);
 }
 
 {
   SendMessage((HWND) GetHWND(), ZYZG_SETBEZELFACE, w, 0);
 }
 

-void wxGaugeMSW::SetRange(const int r)
+void wxGaugeMSW::SetRange(int r)

 {
   m_rangeMax = r;
 
   SendMessage((HWND) GetHWND(), ZYZG_SETRANGE, r, 0);
 }
 
 {
   m_rangeMax = r;
 
   SendMessage((HWND) GetHWND(), ZYZG_SETRANGE, r, 0);
 }
 

-void wxGaugeMSW::SetValue(const int pos)
+void wxGaugeMSW::SetValue(int pos)

 {
   m_gaugePos = pos;
 
 {
   m_gaugePos = pos;
 


@@ -548,13 +544,13 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
     else return;
 
     /* select NULL_PEN for no borders */
     else return;
 
     /* select NULL_PEN for no borders */

-    hOldPen = SelectObject(hdc, GetStockObject(NULL_PEN));
+    hOldPen = (HPEN) SelectObject(hdc, GetStockObject(NULL_PEN));

 
     /* select the appropriate color for the fill */
     if (fDark)
 
     /* select the appropriate color for the fill */
     if (fDark)

-        hOldBrush = SelectObject(hdc, GetStockObject(GRAY_BRUSH));
+        hOldBrush = (HBRUSH) SelectObject(hdc, GetStockObject(GRAY_BRUSH));

     else
     else

-        hOldBrush = SelectObject(hdc, GetStockObject(WHITE_BRUSH));
+        hOldBrush = (HBRUSH) SelectObject(hdc, GetStockObject(WHITE_BRUSH));

 
     /* finally, draw the dern thing */
     Polygon(hdc, (LPPOINT)&Point, 4);
 
     /* finally, draw the dern thing */
     Polygon(hdc, (LPPOINT)&Point, 4);


@@ -659,7 +655,7 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
 
 
 /* get the includes we need */
 
 
 /* get the includes we need */

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)

 #include <malloc.h>
 #endif
 #include <stdio.h>
 #include <malloc.h>
 #endif
 #include <stdio.h>


@@ -865,7 +861,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     GetClientRect(hwnd, &rc1);
 
     /* draw a black border on the _outside_ */
     GetClientRect(hwnd, &rc1);
 
     /* draw a black border on the _outside_ */

-    FrameRect(hdc, &rc1, GetStockObject(BLACK_BRUSH));
+    FrameRect(hdc, &rc1, (HBRUSH) GetStockObject(BLACK_BRUSH));

 
     /* we want to draw _just inside_ the black border */
     InflateRect(&rc1, -1, -1);
 
     /* we want to draw _just inside_ the black border */
     InflateRect(&rc1, -1, -1);


@@ -886,7 +882,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
        InflateRect(&rc1, ~(pgauge->wWidth3D), ~(pgauge->wWidth3D));
 
         /* draw a black border on the _inside_ */
        InflateRect(&rc1, ~(pgauge->wWidth3D), ~(pgauge->wWidth3D));
 
         /* draw a black border on the _inside_ */

-        FrameRect(hdc, &rc1, GetStockObject(BLACK_BRUSH));
+        FrameRect(hdc, &rc1, (HBRUSH) GetStockObject(BLACK_BRUSH));

 
         /* we want to draw _just inside_ the black border */
         InflateRect(&rc1, -1, -1);
 
         /* we want to draw _just inside_ the black border */
         InflateRect(&rc1, -1, -1);


@@ -933,7 +929,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     } /* switch () */
 
     /* select the correct font */
     } /* switch () */
 
     /* select the correct font */

-    hFont = SelectObject(hdc, pgauge->hFont);
+    hFont = (HFONT) SelectObject(hdc, pgauge->hFont);

 
     /* build up a string to blit out--ie the meaning of life: "42%" */
     wsprintf(ach, "%3d%%", (WORD)((DWORD)iPos * 100 / iRange));
 
     /* build up a string to blit out--ie the meaning of life: "42%" */
     wsprintf(ach, "%3d%%", (WORD)((DWORD)iPos * 100 / iRange));


@@ -1156,7 +1152,7 @@ zyzgForceRepaint3D:
         case WM_SETFONT:
             /* if NULL hFont, use system font */
             if (!(hFont = (HFONT)wParam))
         case WM_SETFONT:
             /* if NULL hFont, use system font */
             if (!(hFont = (HFONT)wParam))

-                hFont = GetStockObject(SYSTEM_FONT);
+                hFont = (HFONT) GetStockObject(SYSTEM_FONT);

 
             pgauge->hFont = hFont;
 
 
             pgauge->hFont = hFont;
 


@@ -1176,4 +1172,4 @@ zyzgForceRepaint3D:
 
 /** EOF: zyzgauge.c **/
 
 
 /** EOF: zyzgauge.c **/
 

-#endif // USE_GAUGE
+#endif // wxUSE_GAUGE