IsModified() function now works correctly

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 0858f7afe9ba798d2eb3ceb7412c2242a931f498..ce22737cb54c186b025b1fd91e537e1c7e42118b 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -80,9 +80,9 @@
 #undef GetClassInfo
 #endif
 
 #undef GetClassInfo
 #endif
 

-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__

   static const char *GetMessageName(int message);
   static const char *GetMessageName(int message);

-#endif  //DEBUG
+#endif  //WXDEBUG

 
 #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
 
 
 #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
 


@@ -98,7 +98,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
   EVT_CHAR(wxWindow::OnChar)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
   EVT_CHAR(wxWindow::OnChar)

-  EVT_SIZE(wxWindow::OnSize)

   EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindow::OnInitDialog)
   EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindow::OnInitDialog)


@@ -808,7 +807,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
   if (fontToUse && fontToUse->Ok())
   {
     if ((fnt=(HFONT) fontToUse->GetResourceHandle()))
   if (fontToUse && fontToUse->Ok())
   {
     if ((fnt=(HFONT) fontToUse->GetResourceHandle()))

-      was = SelectObject(dc,fnt) ;
+      was = (HFONT) SelectObject(dc,fnt) ;

   }
 
   SIZE sizeRect;
   }
 
   SIZE sizeRect;


@@ -866,7 +865,7 @@ LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
        wxWndHook = NULL;
     wnd->m_hWnd = (WXHWND) hWnd;
   }
        wxWndHook = NULL;
     wnd->m_hWnd = (WXHWND) hWnd;
   }

-#if (DEBUG > 1)
+#if (WXDEBUG > 1)

   wxDebugMsg("hWnd = %d, m_hWnd = %d, msg = %d\n", hWnd, m_hWnd, message);
 #endif
   // Stop right here if we don't have a valid handle
   wxDebugMsg("hWnd = %d, m_hWnd = %d, msg = %d\n", hWnd, m_hWnd, message);
 #endif
   // Stop right here if we don't have a valid handle


@@ -900,9 +899,9 @@ LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 // Main Windows 3 window proc
 long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 // Main Windows 3 window proc
 long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

-  #ifdef __DEBUG__
+  #ifdef __WXDEBUG__

     wxLogTrace(wxTraceMessages, "Processing %s", GetMessageName(message));
     wxLogTrace(wxTraceMessages, "Processing %s", GetMessageName(message));

-  #endif // DEBUG
+  #endif // WXDEBUG

 
   HWND hWnd = (HWND)m_hWnd;
 
 
   HWND hWnd = (HWND)m_hWnd;
 


@@ -1436,7 +1435,7 @@ void wxWindow::MSWDestroyWindow(void)
 {
 #if 0
 
 {
 #if 0
 

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWDestroyWindow %d\n", handle);
 #endif
   MSWDetachWindowMenu();
   wxDebugMsg("wxWindow::MSWDestroyWindow %d\n", handle);
 #endif
   MSWDetachWindowMenu();


@@ -1541,7 +1540,7 @@ void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow
   wxWndHook = NULL;
   wxWinHandleList->Append((long)m_hWnd, this);
 
   wxWndHook = NULL;
   wxWinHandleList->Append((long)m_hWnd, this);
 

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWCreate %d\n", m_hWnd);
 #endif
 }
   wxDebugMsg("wxWindow::MSWCreate %d\n", m_hWnd);
 #endif
 }


@@ -1552,7 +1551,7 @@ void wxWindow::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
 
 bool wxWindow::MSWOnClose(void)
 {
 
 bool wxWindow::MSWOnClose(void)
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnClose %d\n", handle);
 #endif
   return FALSE;
   wxDebugMsg("wxWindow::MSWOnClose %d\n", handle);
 #endif
   return FALSE;


@@ -1560,7 +1559,7 @@ bool wxWindow::MSWOnClose(void)
 
 bool wxWindow::MSWOnDestroy(void)
 {
 
 bool wxWindow::MSWOnDestroy(void)
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnDestroy %d\n", handle);
 #endif
   // delete our drop target if we've got one
   wxDebugMsg("wxWindow::MSWOnDestroy %d\n", handle);
 #endif
   // delete our drop target if we've got one


@@ -1621,7 +1620,7 @@ bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
 
 void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))
 {
 
 void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnMenuHighlight %d\n", handle);
 #endif
 }
   wxDebugMsg("wxWindow::MSWOnMenuHighlight %d\n", handle);
 #endif
 }


@@ -1632,7 +1631,7 @@ void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem)
 
 bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate))
 {
 
 bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate))
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnActivate %d\n", handle);
 #endif
 
   wxDebugMsg("wxWindow::MSWOnActivate %d\n", handle);
 #endif
 


@@ -1645,7 +1644,7 @@ bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSE
 
 bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
 {
 
 bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnSetFocus %d\n", m_hWnd);
 #endif
     // Deal with caret
   wxDebugMsg("wxWindow::MSWOnSetFocus %d\n", m_hWnd);
 #endif
     // Deal with caret


@@ -1665,7 +1664,7 @@ bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
 
 bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
 {
 
 bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnKillFocus %d\n", m_hWnd);
 #endif
     // Deal with caret
   wxDebugMsg("wxWindow::MSWOnKillFocus %d\n", m_hWnd);
 #endif
     // Deal with caret


@@ -1683,11 +1682,11 @@ bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
 
 void wxWindow::MSWOnDropFiles(WXWPARAM wParam)
 {
 
 void wxWindow::MSWOnDropFiles(WXWPARAM wParam)
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnDropFiles %d\n", m_hWnd);
 #endif
 
   wxDebugMsg("wxWindow::MSWOnDropFiles %d\n", m_hWnd);
 #endif
 

-  HANDLE hFilesInfo = (HANDLE)wParam;
+  HDROP hFilesInfo = (HDROP) wParam;

   POINT dropPoint;
   DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);
 
   POINT dropPoint;
   DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);
 


@@ -1776,7 +1775,7 @@ bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
 WXHBRUSH wxWindow::MSWOnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                          WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXHBRUSH wxWindow::MSWOnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                          WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnCtlColour %d\n", m_hWnd);
 #endif
   if (nCtlColor == CTLCOLOR_DLG)
   wxDebugMsg("wxWindow::MSWOnCtlColour %d\n", m_hWnd);
 #endif
   if (nCtlColor == CTLCOLOR_DLG)


@@ -1852,10 +1851,10 @@ long wxWindow::Default()
     if (m_lastMsg == 0)
         return 0;
 
     if (m_lastMsg == 0)
         return 0;
 

-    #ifdef __DEBUG__
+    #ifdef __WXDEBUG__

         wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.",
                   GetMessageName(m_lastMsg));
         wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.",
                   GetMessageName(m_lastMsg));

-    #endif // DEBUG
+    #endif // WXDEBUG

 
     return this->MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam);
 }
 
     return this->MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam);
 }


@@ -1930,7 +1929,7 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
 
 long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))
 {
 
 long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnMDIActivate %d\n", m_hWnd);
 #endif
   return 1;
   wxDebugMsg("wxWindow::MSWOnMDIActivate %d\n", m_hWnd);
 #endif
   return 1;


@@ -1969,7 +1968,7 @@ void wxWindow::MSWOnSize(int w, int h, WXUINT WXUNUSED(flag))
   if (m_inOnSize)
     return;
     
   if (m_inOnSize)
     return;
     

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnSize %d\n", m_hWnd);
 #endif
   if (!m_hWnd)
   wxDebugMsg("wxWindow::MSWOnSize %d\n", m_hWnd);
 #endif
   if (!m_hWnd)


@@ -1993,7 +1992,7 @@ void wxWindow::MSWOnWindowPosChanging(void *WXUNUSED(lpPos))
 // Deal with child commands from buttons etc.
 bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
 {
 // Deal with child commands from buttons etc.
 bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxWindow::MSWOnCommand\n");
 #endif
   if (wxCurrentPopupMenu)
   wxDebugMsg("wxWindow::MSWOnCommand\n");
 #endif
   if (wxCurrentPopupMenu)


@@ -2003,7 +2002,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
     bool succ = popupMenu->MSWCommand(cmd, id);
     return succ;
   }
     bool succ = popupMenu->MSWCommand(cmd, id);
     return succ;
   }

-#if DEBUG > 1
+#if WXDEBUG > 1

   char buf[80];
   sprintf(buf, "Looking for item %d...\n", id);
   wxDebugMsg(buf);
   char buf[80];
   sprintf(buf, "Looking for item %d...\n", id);
   wxDebugMsg(buf);


@@ -2013,7 +2012,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
   if (item)
   {
     bool value = item->MSWCommand(cmd, id);
   if (item)
   {
     bool value = item->MSWCommand(cmd, id);

-#if DEBUG > 1
+#if WXDEBUG > 1

     if (value)
       wxDebugMsg("MSWCommand succeeded\n");
     else
     if (value)
       wxDebugMsg("MSWCommand succeeded\n");
     else


@@ -2023,7 +2022,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
   }
   else
   {
   }
   else
   {

-#if DEBUG > 1
+#if WXDEBUG > 1

     wxDebugMsg("Could not find item!\n");
     char buf[100];
     wxDebugMsg("Item ids for this panel:\n");
     wxDebugMsg("Could not find item!\n");
     char buf[100];
     wxDebugMsg("Item ids for this panel:\n");


@@ -2642,18 +2641,18 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font)
   HFONT was = 0;
   if (the_font)
   {
   HFONT was = 0;
   if (the_font)
   {

-#if DEBUG > 1
+#if WXDEBUG > 1

     wxDebugMsg("wxGetCharSize: Selecting HFONT %X\n", fnt);
 #endif
 //    the_font->UseResource();
 //    the_font->RealizeResource();
     if ((fnt=(HFONT) the_font->GetResourceHandle()))
     wxDebugMsg("wxGetCharSize: Selecting HFONT %X\n", fnt);
 #endif
 //    the_font->UseResource();
 //    the_font->RealizeResource();
     if ((fnt=(HFONT) the_font->GetResourceHandle()))

-      was = SelectObject(dc,fnt) ;
+      was = (HFONT) SelectObject(dc,fnt) ;

   }
   GetTextMetrics(dc, &tm);
   if (the_font && fnt && was)
   {
   }
   GetTextMetrics(dc, &tm);
   if (the_font && fnt && was)
   {

-#if DEBUG > 1
+#if WXDEBUG > 1

     wxDebugMsg("wxGetCharSize: Selecting old HFONT %X\n", was);
 #endif
     SelectObject(dc,was) ;
     wxDebugMsg("wxGetCharSize: Selecting old HFONT %X\n", was);
 #endif
     SelectObject(dc,was) ;


@@ -3447,15 +3446,6 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
                ::ScrollWindow((HWND) GetHWND(), dx, dy, NULL, NULL);
 }
 
                ::ScrollWindow((HWND) GetHWND(), dx, dy, NULL, NULL);
 }
 

-void wxWindow::OnSize(wxSizeEvent& event)
-{
-       Default();
-#if USE_CONSTRAINTS
-  if (GetAutoLayout())
-    Layout();
-#endif
-}
-

 /*
 void wxWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
 /*
 void wxWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {


@@ -4355,7 +4345,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
   if (vert_units)
         y_pages = (int)(v_height/vert_units) - y_page;
 
   if (vert_units)
         y_pages = (int)(v_height/vert_units) - y_page;
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   int y = 0;
 #else
   int y = y_page-1;
   int y = 0;
 #else
   int y = y_page-1;


@@ -4518,7 +4508,7 @@ bool wxWindow::AcceptsFocus() const
   return IsShown() && IsEnabled();
 }
 
   return IsShown() && IsEnabled();
 }
 

-#ifdef __DEBUG__
+#ifdef __WXDEBUG__

 static const char *GetMessageName(int message)
 {
   switch ( message ) {
 static const char *GetMessageName(int message)
 {
   switch ( message ) {


@@ -4659,4 +4649,4 @@ static const char *GetMessageName(int message)
       return s_szBuf;
   }
 }
       return s_szBuf;
   }
 }

-#endif //DEBUG
+#endif //WXDEBUG