Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv14820/include/gui
Modified Files:
wxComposeView.h wxDialogLayout.h wxMDialogs.h wxOptionsPage.h
Log Message:
Header dependency cleanup, last few well aimed hits
Index: wxComposeView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxComposeView.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -b -u -2 -r1.92 -r1.93
--- wxComposeView.h 18 Sep 2003 16:30:44 -0000 1.92
+++ wxComposeView.h 19 Sep 2003 13:31:19 -0000 1.93
@@ -23,4 +23,6 @@
#ifndef USE_PCH
+# include "gui/wxMFrame.h"
+# include "kbList.h"
#endif // USE_PCH
Index: wxDialogLayout.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxDialogLayout.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -b -u -2 -r1.71 -r1.72
--- wxDialogLayout.h 18 Sep 2003 16:30:44 -0000 1.71
+++ wxDialogLayout.h 19 Sep 2003 13:31:19 -0000 1.72
@@ -20,6 +20,4 @@
#ifndef USE_PCH
-# include "Profile.h"
-
# include <wx/textctrl.h>
#endif // USE_PCH
@@ -28,4 +26,5 @@
#include "gui/wxMDialogs.h"
+#include "MEvent.h"
// use wxListbook instead of wxNotebook if available
@@ -157,6 +156,5 @@
// event handlers
- virtual inline void OnHelp(wxCommandEvent & /*ev*/)
- { mApplication->Help(m_helpId, this); }
+ virtual void OnHelp(wxCommandEvent & /*ev*/);
protected:
@@ -326,16 +324,7 @@
const wxString& profileKey,
wxWindow *parent,
- const wxString& title)
- : wxManuallyLaidOutDialog(parent, title, profileKey)
- {
- m_profile = profile;
- m_profile->IncRef(); // paranoid
- m_hasChanges = FALSE;
- }
+ const wxString& title);
- virtual ~wxProfileSettingsEditDialog()
- {
- m_profile->DecRef();
- }
+ virtual ~wxProfileSettingsEditDialog();
virtual Profile *GetProfile() const { return m_profile; }
Index: wxMDialogs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMDialogs.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -b -u -2 -r1.109 -r1.110
--- wxMDialogs.h 18 Sep 2003 16:30:44 -0000 1.109
+++ wxMDialogs.h 19 Sep 2003 13:31:19 -0000 1.110
@@ -15,6 +15,5 @@
#ifndef USE_PCH
-# include "gui/wxIconManager.h"
-# include "MApplication.h"
+# include "FolderType.h"
# include <wx/bmpbuttn.h>
@@ -540,12 +539,5 @@
{
public:
- wxXFaceButton(wxWindow *parent, int id, wxString filename)
- {
- m_Parent = parent;
- wxBitmap bmp = mApplication->GetIconManager()->GetBitmap(_T("noxface"));
- wxBitmapButton::Create(parent,id, bmp, wxDefaultPosition,
- wxSize(64,64));
- SetFile(filename);
- }
+ wxXFaceButton(wxWindow *parent, int id, wxString filename);
void SetFile(const wxString &filename);
wxString GetFile(void) const { return m_XFace; }
@@ -558,9 +550,5 @@
/// returns the argument if it's !NULL of the top-level application frame
-inline wxWindow *GetDialogParent(const wxWindow *parent)
-{
- return parent == NULL ? mApplication->TopLevelFrame()
- : GetFrame(parent);
-}
+extern wxWindow *GetDialogParent(const wxWindow *parent);
#endif //WXMDIALOGS_H
Index: wxOptionsPage.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxOptionsPage.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -b -u -2 -r1.61 -r1.62
--- wxOptionsPage.h 18 Sep 2003 16:30:44 -0000 1.61
+++ wxOptionsPage.h 19 Sep 2003 13:31:20 -0000 1.62
@@ -152,10 +152,5 @@
// to change the profile associated with the page:
- void SetProfile(Profile *profile)
- {
- SafeDecRef(m_Profile);
- m_Profile = profile;
- SafeIncRef(m_Profile);
- }
+ void SetProfile(Profile *profile);
// callbacks
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
