Applied modified form of the StdButtonSize patch.

[wxWidgets.git] / src / common / cshelp.cpp

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 6267f85db0fc95d6c9d899b99c5a543a75da5209..5d5f7f200f398aea09c541104d2eca86d7ece2e2 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -77,7 +77,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject)
 
 wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp)
 {
 
 wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp)
 {

-    m_inHelp = FALSE;
+    m_inHelp = false;

 
     if (beginHelp)
         BeginContextHelp(win);
 
     if (beginHelp)
         BeginContextHelp(win);


@@ -97,9 +97,9 @@ static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool pu
     if (push)
         win->PushEventHandler(new wxContextHelpEvtHandler(help));
     else
     if (push)
         win->PushEventHandler(new wxContextHelpEvtHandler(help));
     else

-        win->PopEventHandler(TRUE);
+        win->PopEventHandler(true);

 
 

-    wxWindowList::Node* node = win->GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();

     while (node)
     {
         wxWindow* child = node->GetData();
     while (node)
     {
         wxWindow* child = node->GetData();


@@ -116,7 +116,7 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     if (!win)
         win = wxTheApp->GetTopWindow();
     if (!win)
     if (!win)
         win = wxTheApp->GetTopWindow();
     if (!win)

-        return FALSE;
+        return false;

 
     wxCursor cursor(wxCURSOR_QUESTION_ARROW);
     wxCursor oldCursor = win->GetCursor();
 
     wxCursor cursor(wxCURSOR_QUESTION_ARROW);
     wxCursor oldCursor = win->GetCursor();


@@ -126,10 +126,10 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     //    wxSetCursor(cursor);
 #endif
 
     //    wxSetCursor(cursor);
 #endif
 

-    m_status = FALSE;
+    m_status = false;

 
 #ifdef __WXMOTIF__
 
 #ifdef __WXMOTIF__

-    wxPushOrPopEventHandlers(this, win, TRUE);
+    wxPushOrPopEventHandlers(this, win, true);

 #else
     win->PushEventHandler(new wxContextHelpEvtHandler(this));
 #endif
 #else
     win->PushEventHandler(new wxContextHelpEvtHandler(this));
 #endif


@@ -141,9 +141,9 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     win->ReleaseMouse();
 
 #ifdef __WXMOTIF__
     win->ReleaseMouse();
 
 #ifdef __WXMOTIF__

-    wxPushOrPopEventHandlers(this, win, FALSE);
+    wxPushOrPopEventHandlers(this, win, false);

 #else
 #else

-    win->PopEventHandler(TRUE);
+    win->PopEventHandler(true);

 #endif
 
     win->SetCursor(oldCursor);
 #endif
 
     win->SetCursor(oldCursor);


@@ -165,19 +165,19 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
             DispatchEvent(winAtPtr, pt);
     }
 
             DispatchEvent(winAtPtr, pt);
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxContextHelp::EndContextHelp()
 {
 }
 
 bool wxContextHelp::EndContextHelp()
 {

-    m_inHelp = FALSE;
+    m_inHelp = false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxContextHelp::EventLoop()
 {
 }
 
 bool wxContextHelp::EventLoop()
 {

-    m_inHelp = TRUE;
+    m_inHelp = true;

 
     while ( m_inHelp )
     {
 
     while ( m_inHelp )
     {


@@ -191,16 +191,16 @@ bool wxContextHelp::EventLoop()
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
 {
     if (event.GetEventType() == wxEVT_LEFT_DOWN)
     {
 }
 
 bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
 {
     if (event.GetEventType() == wxEVT_LEFT_DOWN)
     {

-        m_contextHelp->SetStatus(TRUE);
+        m_contextHelp->SetStatus(true);

         m_contextHelp->EndContextHelp();
         m_contextHelp->EndContextHelp();

-        return TRUE;
+        return true;

     }
 
     if ((event.GetEventType() == wxEVT_CHAR) ||
     }
 
     if ((event.GetEventType() == wxEVT_CHAR) ||


@@ -208,31 +208,31 @@ bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
         (event.GetEventType() == wxEVT_ACTIVATE) ||
         (event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED))
     {
         (event.GetEventType() == wxEVT_ACTIVATE) ||
         (event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED))
     {

-        // May have already been set to TRUE by a left-click
-        //m_contextHelp->SetStatus(FALSE);
+        // May have already been set to true by a left-click
+        //m_contextHelp->SetStatus(false);

         m_contextHelp->EndContextHelp();
         m_contextHelp->EndContextHelp();

-        return TRUE;
+        return true;

     }
 
     if ((event.GetEventType() == wxEVT_PAINT) ||
         (event.GetEventType() == wxEVT_ERASE_BACKGROUND))
     {
         event.Skip();
     }
 
     if ((event.GetEventType() == wxEVT_PAINT) ||
         (event.GetEventType() == wxEVT_ERASE_BACKGROUND))
     {
         event.Skip();

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 // Dispatch the help event to the relevant window
 bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
 {
     wxWindow* subjectOfHelp = win;
 }
 
 // Dispatch the help event to the relevant window
 bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
 {
     wxWindow* subjectOfHelp = win;

-    bool eventProcessed = FALSE;
+    bool eventProcessed = false;

     while (subjectOfHelp && !eventProcessed)
     {
         wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
     while (subjectOfHelp && !eventProcessed)
     {
         wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;

-        helpEvent.SetEventObject(this);
+        helpEvent.SetEventObject(subjectOfHelp);

 
         eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
 
 
         eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
 


@@ -352,8 +352,9 @@ void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 {
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 {

-    m_hashIds.erase((long)id);
-    m_hashIds[id] = text;
+    wxLongToStringHashMap::key_type key = (wxLongToStringHashMap::key_type)id;
+    m_hashIds.erase(key);
+    m_hashIds[key] = text;

 }
 
 // removes the association
 }
 
 // removes the association


@@ -381,11 +382,11 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
     {
         s_tipWindow = new wxTipWindow((wxWindow *)window, text, 100, & s_tipWindow);
 
     {
         s_tipWindow = new wxTipWindow((wxWindow *)window, text, 100, & s_tipWindow);
 

-        return TRUE;
+        return true;

     }
 #endif // wxUSE_TIPWINDOW
 
     }
 #endif // wxUSE_TIPWINDOW
 

-    return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -410,7 +411,7 @@ bool wxHelpControllerHelpProvider::ShowHelp(wxWindowBase *window)
             // If the help controller is capable of popping up the text...
             else if (m_helpController->DisplayTextPopup(text, wxGetMousePosition()))
             {
             // If the help controller is capable of popping up the text...
             else if (m_helpController->DisplayTextPopup(text, wxGetMousePosition()))
             {

-                return TRUE;
+                return true;

             }
             else
             // ...else use the default method.
             }
             else
             // ...else use the default method.


@@ -421,7 +422,7 @@ bool wxHelpControllerHelpProvider::ShowHelp(wxWindowBase *window)
 
     }
 
 
     }
 

-    return FALSE;
+    return false;

 }
 
 // Convenience function for turning context id into wxString
 }
 
 // Convenience function for turning context id into wxString


@@ -452,7 +453,7 @@ bool wxHelpProviderModule::OnInit()
     // since it could pull in extra code
     // wxHelpProvider::Set(new wxSimpleHelpProvider);
 
     // since it could pull in extra code
     // wxHelpProvider::Set(new wxSimpleHelpProvider);
 

-    return TRUE;
+    return true;

 }
 
 void wxHelpProviderModule::OnExit()
 }
 
 void wxHelpProviderModule::OnExit()