Small changes after Robert's edits

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

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 1942703c024e62247ab11934172b0c61e7f444b9..c112a89b234b211f21cf54840c7a9ec47be7bac1 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -53,7 +53,7 @@
 #include <windows.h>
 #endif
 
-#ifndef __WXGTK__
+#ifdef __WXMSW__
 #include "wx/help.h"
 #endif
 
@@ -113,7 +113,7 @@ wxResourceManager::wxResourceManager():
   m_propertyWindowSize.width = 300;
   m_propertyWindowSize.height = 300;
 
-#ifndef __WXGTK__
+#ifdef __WXMSW__
   m_helpController = NULL;
 #endif
 
@@ -126,7 +126,7 @@ wxResourceManager::~wxResourceManager()
   sm_currentResourceManager = NULL;
   SaveOptions();
 
-#ifndef __WXGTK__
+#ifdef __WXMSW__
   if (m_helpController)
   {
     m_helpController->Quit();
@@ -159,7 +159,7 @@ bool wxResourceManager::Initialize()
 
   LoadOptions();
 
-#ifndef __WXGTK__
+#ifdef __WXMSW__
   m_helpController = new wxHelpController;
   m_helpController->Initialize("dialoged");
 #endif
@@ -2047,7 +2047,7 @@ void wxResourceEditorFrame::OnTest(wxCommandEvent& WXUNUSED(event))
 
 void wxResourceEditorFrame::OnContents(wxCommandEvent& WXUNUSED(event))
 {
-#ifndef __WXGTK__
+#ifdef __WXMSW__
       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
@@ -2220,7 +2220,7 @@ bool EditorToolBar::OnLeftClick(int toolIndex, bool toggled)
     }
     case TOOLBAR_HELP:
     {
-#ifndef __WXGTK__
+#ifdef __WXMSW__
       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
@@ -2335,18 +2335,3 @@ void EditorToolBar::OnMouseEnter(int toolIndex)
   else frame->SetStatusText("");
 }
 
-void EditorToolBar::OnPaint(wxPaintEvent& event)
-{
-#ifndef __WXGTK__
-  wxToolBar::OnPaint(event);
-
-  wxPaintDC dc(this);
-  int w, h;
-  GetSize(&w, &h);
-  dc.SetPen(wxBLACK_PEN);
-  dc.SetBrush(wxTRANSPARENT_BRUSH);
-  dc.DrawLine(0, h-1, w, h-1);
-#endif
-}
-
-

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 116bb3b0d84a10301285ab67119ae244dae1ea66..8b8af13ad2678905fe18b3081c36f6aeaa975db8 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -286,7 +286,9 @@ public:
    inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; }
    inline wxList& GetSelections() { return m_selections; }
    inline wxMenu *GetPopupMenu() const { return m_popupMenu; }
-//   inline wxHelpController *GetHelpController() const { return m_helpController; }
+#ifdef __WXMSW__
+   inline wxHelpController *GetHelpController() const { return m_helpController; }
+#endif
 
    inline void Modify(bool mod = TRUE) { m_modified = mod; }
    inline bool Modified() const { return m_modified; }
@@ -310,7 +312,9 @@ public:
 
 // Member variables
  protected:
-//   wxHelpController*                m_helpController;
+#ifdef __WXMSW__
+   wxHelpController*                m_helpController;
+#endif
    wxResourceTableWithSaving        m_resourceTable;
    wxFrame*                         m_editorFrame;
    wxResourceEditorScrolledWindow*  m_editorPanel;
@@ -410,7 +414,6 @@ public:
             long style = wxTB_HORIZONTAL);
   bool OnLeftClick(int toolIndex, bool toggled);
   void OnMouseEnter(int toolIndex);
-  void OnPaint(wxPaintEvent& event);
 
 DECLARE_EVENT_TABLE()
 };