wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 8f1e6f9db3593540942938492f89c38e85631186..090bf260e2d1468b35a53248a01fc8e1eb86ae27 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -45,7 +45,7 @@
 #endif
 
 extern wxList wxModelessWindows;
 #endif
 
 extern wxList wxModelessWindows;

-extern wxList wxPendingDelete;
+extern wxList WXDLLEXPORT wxPendingDelete;

 extern char wxFrameClassName[];
 extern wxMenu *wxCurrentPopupMenu;
 
 extern char wxFrameClassName[];
 extern wxMenu *wxCurrentPopupMenu;
 


@@ -612,7 +612,7 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 

-#ifndef __WIN16__
+#if !defined(__WIN16__) && !defined(__SC__)

   if (style & wxFRAME_TOOL_WINDOW)
     extendedStyle |= WS_EX_TOOLWINDOW;
 #endif
   if (style & wxFRAME_TOOL_WINDOW)
     extendedStyle |= WS_EX_TOOLWINDOW;
 #endif


@@ -648,7 +648,7 @@ bool wxFrame::MSWOnPaint(void)
       HDC cdc = BeginPaint((HWND) GetHWND(), &ps);
       
       // Erase background before painting or we get white background
       HDC cdc = BeginPaint((HWND) GetHWND(), &ps);
       
       // Erase background before painting or we get white background

-      this->MSWDefWindowProc(WM_ICONERASEBKGND,(WORD)ps.hdc,0L);
+      this->MSWDefWindowProc(WM_ICONERASEBKGND,(WORD)(LONG) ps.hdc,0L);

       
       if (the_icon)
       {
       
       if (the_icon)
       {


@@ -894,9 +894,14 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
       wxMenuBar *menuBar = GetMenuBar();
       if (menuBar)
       {
       wxMenuBar *menuBar = GetMenuBar();
       if (menuBar)
       {

-        wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
+// #ifndef __SALFORDC__
+        int menuId = event.GetMenuId();
+        wxString helpString;
+        // This causes a spurious access violation with Salford C++
+        helpString = menuBar->GetHelpString(menuId);

         if (helpString != "")
         if (helpString != "")

-          SetStatusText(helpString);
+            SetStatusText(helpString);
+// #endif

       }
     }
   }
       }
     }
   }