Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small changes after Robert's edits

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-15 20:10:16 +00:00
parent cd53f34118
commit d0fff5cb11
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
utils/dialoged/src/reseditr.cpp
View File

@@ -53,7 +53,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifndef __WXGTK__ #ifdef __WXMSW__
#include "wx/help.h" #include "wx/help.h"
#endif #endif
@@ -113,7 +113,7 @@ wxResourceManager::wxResourceManager():
m_propertyWindowSize.width = 300; m_propertyWindowSize.width = 300;
m_propertyWindowSize.height = 300; m_propertyWindowSize.height = 300;
#ifndef __WXGTK__ #ifdef __WXMSW__
m_helpController = NULL; m_helpController = NULL;
#endif #endif
@@ -126,7 +126,7 @@ wxResourceManager::~wxResourceManager()
sm_currentResourceManager = NULL; sm_currentResourceManager = NULL;
SaveOptions(); SaveOptions();
#ifndef __WXGTK__ #ifdef __WXMSW__
if (m_helpController) if (m_helpController)
{ {
m_helpController->Quit(); m_helpController->Quit();
@@ -159,7 +159,7 @@ bool wxResourceManager::Initialize()
LoadOptions(); LoadOptions();
#ifndef __WXGTK__ #ifdef __WXMSW__
m_helpController = new wxHelpController; m_helpController = new wxHelpController;
m_helpController->Initialize("dialoged"); m_helpController->Initialize("dialoged");
#endif #endif
@@ -2047,7 +2047,7 @@ void wxResourceEditorFrame::OnTest(wxCommandEvent& WXUNUSED(event))
void wxResourceEditorFrame::OnContents(wxCommandEvent& WXUNUSED(event)) void wxResourceEditorFrame::OnContents(wxCommandEvent& WXUNUSED(event))
{ {
#ifndef __WXGTK__ #ifdef __WXMSW__
wxBeginBusyCursor(); wxBeginBusyCursor();
manager->GetHelpController()->LoadFile(); manager->GetHelpController()->LoadFile();
manager->GetHelpController()->DisplayContents(); manager->GetHelpController()->DisplayContents();
@@ -2220,7 +2220,7 @@ bool EditorToolBar::OnLeftClick(int toolIndex, bool toggled)
} }
case TOOLBAR_HELP: case TOOLBAR_HELP:
{ {
#ifndef __WXGTK__ #ifdef __WXMSW__
wxBeginBusyCursor(); wxBeginBusyCursor();
manager->GetHelpController()->LoadFile(); manager->GetHelpController()->LoadFile();
manager->GetHelpController()->DisplayContents(); manager->GetHelpController()->DisplayContents();
@@ -2335,18 +2335,3 @@ void EditorToolBar::OnMouseEnter(int toolIndex)
else frame->SetStatusText(""); 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
}

9
utils/dialoged/src/reseditr.h
View File

@@ -286,7 +286,9 @@ public:
inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; } inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; }
inline wxList& GetSelections() { return m_selections; } inline wxList& GetSelections() { return m_selections; }
inline wxMenu *GetPopupMenu() const { return m_popupMenu; } 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 void Modify(bool mod = TRUE) { m_modified = mod; }
inline bool Modified() const { return m_modified; } inline bool Modified() const { return m_modified; }
@@ -310,7 +312,9 @@ public:
// Member variables // Member variables
protected: protected:
// wxHelpController* m_helpController; #ifdef __WXMSW__
wxHelpController* m_helpController;
#endif
wxResourceTableWithSaving m_resourceTable; wxResourceTableWithSaving m_resourceTable;
wxFrame* m_editorFrame; wxFrame* m_editorFrame;
wxResourceEditorScrolledWindow* m_editorPanel; wxResourceEditorScrolledWindow* m_editorPanel;
@@ -410,7 +414,6 @@ public:
long style = wxTB_HORIZONTAL); long style = wxTB_HORIZONTAL);
bool OnLeftClick(int toolIndex, bool toggled); bool OnLeftClick(int toolIndex, bool toggled);
void OnMouseEnter(int toolIndex); void OnMouseEnter(int toolIndex);
void OnPaint(wxPaintEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };