Fix for GetValue

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

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 18b62f6f6613f48c7fd29330fe2501b56963b19d..4d173898bc8e01dd7b324f4358b47183fa379cbc 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -6,7 +6,7 @@
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -144,14 +144,14 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     {
         wxPoint pt;
         wxWindow* winAtPtr = wxFindWindowAtPointer(pt);
     {
         wxPoint pt;
         wxWindow* winAtPtr = wxFindWindowAtPointer(pt);

-       /*
+    /*

         if (winAtPtr)
         {
         if (winAtPtr)
         {

-       wxString msg;
+    wxString msg;

         msg.Printf("Picked %s (%d)", (const char*) winAtPtr->GetName(), winAtPtr->GetId());
         cout << msg << '\n';
         }
         msg.Printf("Picked %s (%d)", (const char*) winAtPtr->GetName(), winAtPtr->GetId());
         cout << msg << '\n';
         }

-       */
+    */

 
         if (winAtPtr)
             DispatchEvent(winAtPtr, pt);
 
         if (winAtPtr)
             DispatchEvent(winAtPtr, pt);


@@ -170,6 +170,7 @@ bool wxContextHelp::EndContextHelp()
 bool wxContextHelp::EventLoop()
 {
     m_inHelp = TRUE;
 bool wxContextHelp::EventLoop()
 {
     m_inHelp = TRUE;

+

     while ( m_inHelp )
     {
         if (wxTheApp->Pending())
     while ( m_inHelp )
     {
         if (wxTheApp->Pending())


@@ -181,6 +182,7 @@ bool wxContextHelp::EventLoop()
             wxTheApp->ProcessIdle();
         }
     }
             wxTheApp->ProcessIdle();
         }
     }

+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -223,6 +225,7 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
     {
         wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
         helpEvent.SetEventObject(this);
     {
         wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
         helpEvent.SetEventObject(this);

+

         eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
 
         // Go up the window hierarchy until the event is handled (or not).
         eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
 
         // Go up the window hierarchy until the event is handled (or not).


@@ -272,8 +275,15 @@ wxContextHelpButton::wxContextHelpButton(wxWindow* parent,
                                          const wxPoint& pos,
                                          const wxSize& size,
                                          long style)
                                          const wxPoint& pos,
                                          const wxSize& size,
                                          long style)

+#if defined(__WXPM__)
+                   : wxBitmapButton(parent, id, wxBitmap(wxCSQUERY_BITMAP
+                                                         ,wxBITMAP_TYPE_RESOURCE
+                                                        ),
+                                    pos, size, style)
+#else

                    : wxBitmapButton(parent, id, wxBITMAP(csquery),
                                     pos, size, style)
                    : wxBitmapButton(parent, id, wxBITMAP(csquery),
                                     pos, size, style)

+#endif

 {
 }
 
 {
 }