Inexplicable removal of wxRadioBox::MSWWindowProc reversed, so wxRadioBox

works in Dialog Editor again. Compile error in Dialog Editor fixed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/radiobox.h

@@ -78,6 +78,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
+    long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     WXHWND *GetRadioButtons() const { return m_radioButtons; }
     bool ContainsHWND(WXHWND hWnd) const;
     void SendNotificationEvent();

src/msw/choice.cpp

@@ -60,10 +60,6 @@ bool wxChoice::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
-    // A choice/combobox normally has a white background (or other, depending
-    // on global settings) rather than inheriting the parent's background colour.
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-
     long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
     if ( style & wxCB_SORT )
         msStyle |= CBS_SORT;
@@ -79,6 +75,10 @@ bool wxChoice::Create(wxWindow *parent,
     if ( !MSWCreateControl(wxT("COMBOBOX"), msStyle) )
         return FALSE;
 
+    // A choice/combobox normally has a white background (or other, depending
+    // on global settings) rather than inheriting the parent's background colour.
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);

src/msw/radiobox.cpp

@@ -687,6 +687,26 @@ void wxRadioBox::SendNotificationEvent()
     ProcessCommand(event);
 }
 
+long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    // This is required for the radiobox to be sensitive to mouse input,
+    // e.g. for Dialog Editor.
+    if (nMsg == WM_NCHITTEST)
+    {
+        int xPos = LOWORD(lParam);  // horizontal position of cursor
+        int yPos = HIWORD(lParam);  // vertical position of cursor
+
+        ScreenToClient(&xPos, &yPos);
+
+        // Make sure you can drag by the top of the groupbox, but let
+        // other (enclosed) controls get mouse events also
+        if (yPos < 10)
+            return (long)HTCLIENT;
+    }
+
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+
 // ---------------------------------------------------------------------------
 // window proc for radio buttons
 // ---------------------------------------------------------------------------

src/wxvc_dll.dsp

@@ -903,6 +903,9 @@ SOURCE=.\msw\pnghand.cpp
 
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
+# ADD CPP /I "..\include" /I "png" /I "zlib"
+# SUBTRACT CPP /I "../include"
+
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I "png" /I "zlib"
@@ -1382,7 +1385,6 @@ SOURCE=.\zlib\zutil.c
 SOURCE=..\include\wx\msw\setup.h
 # End Source File
 # End Group
-
 # Begin Group "JPEG Files"
 
 # PROP Default_Filter ""
@@ -1390,15 +1392,16 @@ SOURCE=..\include\wx\msw\setup.h
 
 SOURCE=.\jpeg\jcapimin.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1406,15 +1409,16 @@ SOURCE=.\jpeg\jcapimin.c
 
 SOURCE=.\jpeg\jcapistd.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1422,15 +1426,16 @@ SOURCE=.\jpeg\jcapistd.c
 
 SOURCE=.\jpeg\jccoefct.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1438,15 +1443,16 @@ SOURCE=.\jpeg\jccoefct.c
 
 SOURCE=.\jpeg\jccolor.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1454,15 +1460,16 @@ SOURCE=.\jpeg\jccolor.c
 
 SOURCE=.\jpeg\jcdctmgr.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1470,15 +1477,16 @@ SOURCE=.\jpeg\jcdctmgr.c
 
 SOURCE=.\jpeg\jchuff.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1486,15 +1494,16 @@ SOURCE=.\jpeg\jchuff.c
 
 SOURCE=.\jpeg\jcinit.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1502,15 +1511,16 @@ SOURCE=.\jpeg\jcinit.c
 
 SOURCE=.\jpeg\jcmainct.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1518,15 +1528,16 @@ SOURCE=.\jpeg\jcmainct.c
 
 SOURCE=.\jpeg\jcmarker.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1534,15 +1545,16 @@ SOURCE=.\jpeg\jcmarker.c
 
 SOURCE=.\jpeg\jcmaster.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1550,15 +1562,16 @@ SOURCE=.\jpeg\jcmaster.c
 
 SOURCE=.\jpeg\jcomapi.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1566,15 +1579,16 @@ SOURCE=.\jpeg\jcomapi.c
 
 SOURCE=.\jpeg\jcparam.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1582,15 +1596,16 @@ SOURCE=.\jpeg\jcparam.c
 
 SOURCE=.\jpeg\jcphuff.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1598,15 +1613,16 @@ SOURCE=.\jpeg\jcphuff.c
 
 SOURCE=.\jpeg\jcprepct.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1614,15 +1630,16 @@ SOURCE=.\jpeg\jcprepct.c
 
 SOURCE=.\jpeg\jcsample.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1630,15 +1647,16 @@ SOURCE=.\jpeg\jcsample.c
 
 SOURCE=.\jpeg\jctrans.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1646,15 +1664,16 @@ SOURCE=.\jpeg\jctrans.c
 
 SOURCE=.\jpeg\jdapimin.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1662,15 +1681,16 @@ SOURCE=.\jpeg\jdapimin.c
 
 SOURCE=.\jpeg\jdapistd.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1678,15 +1698,16 @@ SOURCE=.\jpeg\jdapistd.c
 
 SOURCE=.\jpeg\jdatadst.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1694,15 +1715,16 @@ SOURCE=.\jpeg\jdatadst.c
 
 SOURCE=.\jpeg\jdatasrc.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1710,15 +1732,16 @@ SOURCE=.\jpeg\jdatasrc.c
 
 SOURCE=.\jpeg\jdcoefct.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1726,15 +1749,16 @@ SOURCE=.\jpeg\jdcoefct.c
 
 SOURCE=.\jpeg\jdcolor.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1742,15 +1766,16 @@ SOURCE=.\jpeg\jdcolor.c
 
 SOURCE=.\jpeg\jddctmgr.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1758,15 +1783,16 @@ SOURCE=.\jpeg\jddctmgr.c
 
 SOURCE=.\jpeg\jdhuff.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1774,15 +1800,16 @@ SOURCE=.\jpeg\jdhuff.c
 
 SOURCE=.\jpeg\jdinput.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1790,15 +1817,16 @@ SOURCE=.\jpeg\jdinput.c
 
 SOURCE=.\jpeg\jdmainct.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1806,15 +1834,16 @@ SOURCE=.\jpeg\jdmainct.c
 
 SOURCE=.\jpeg\jdmarker.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1822,15 +1851,16 @@ SOURCE=.\jpeg\jdmarker.c
 
 SOURCE=.\jpeg\jdmaster.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1838,15 +1868,16 @@ SOURCE=.\jpeg\jdmaster.c
 
 SOURCE=.\jpeg\jdmerge.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1854,15 +1885,16 @@ SOURCE=.\jpeg\jdmerge.c
 
 SOURCE=.\jpeg\jdphuff.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1870,15 +1902,16 @@ SOURCE=.\jpeg\jdphuff.c
 
 SOURCE=.\jpeg\jdpostct.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1886,15 +1919,16 @@ SOURCE=.\jpeg\jdpostct.c
 
 SOURCE=.\jpeg\jdsample.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1902,15 +1936,16 @@ SOURCE=.\jpeg\jdsample.c
 
 SOURCE=.\jpeg\jdtrans.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1918,15 +1953,16 @@ SOURCE=.\jpeg\jdtrans.c
 
 SOURCE=.\jpeg\jerror.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1934,15 +1970,16 @@ SOURCE=.\jpeg\jerror.c
 
 SOURCE=.\jpeg\jfdctflt.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1950,15 +1987,16 @@ SOURCE=.\jpeg\jfdctflt.c
 
 SOURCE=.\jpeg\jfdctfst.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1966,15 +2004,16 @@ SOURCE=.\jpeg\jfdctfst.c
 
 SOURCE=.\jpeg\jfdctint.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1982,15 +2021,16 @@ SOURCE=.\jpeg\jfdctint.c
 
 SOURCE=.\jpeg\jidctflt.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1998,15 +2038,16 @@ SOURCE=.\jpeg\jidctflt.c
 
 SOURCE=.\jpeg\jidctfst.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2014,15 +2055,16 @@ SOURCE=.\jpeg\jidctfst.c
 
 SOURCE=.\jpeg\jidctint.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2030,15 +2072,16 @@ SOURCE=.\jpeg\jidctint.c
 
 SOURCE=.\jpeg\jidctred.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2046,15 +2089,16 @@ SOURCE=.\jpeg\jidctred.c
 
 SOURCE=.\jpeg\jmemmgr.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2062,15 +2106,16 @@ SOURCE=.\jpeg\jmemmgr.c
 
 SOURCE=.\jpeg\jmemnobs.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2078,15 +2123,16 @@ SOURCE=.\jpeg\jmemnobs.c
 
 SOURCE=.\jpeg\jquant1.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2094,15 +2140,16 @@ SOURCE=.\jpeg\jquant1.c
 
 SOURCE=.\jpeg\jquant2.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2110,19 +2157,19 @@ SOURCE=.\jpeg\jquant2.c
 
 SOURCE=.\jpeg\jutils.c
 
-!IF  "$(CFG)" == "jpeg - Win32 Release"
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
 # ADD CPP /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
 # End Group
-
 # End Target
 # End Project

utils/dialoged/src/reseditr.cpp

@@ -2152,7 +2152,7 @@ void wxResourceEditorFrame::OnCloseWindow(wxCloseEvent& event)
     }
   }
     
-  if (!Iconized())
+  if (!IsIconized())
   {
     int w, h;
     GetSize(&w, &h);