[M-CVS] CVS: M/include/gui wxMApp.h,1.58,1.59 wxMenuDefs.h,1.101,1.102

[Vadim Z. <va...@us...>]

Update of /cvsroot/mahogany/M/include/gui
In directory usw-pr-cvs1:/tmp/cvs-serv32585/include/gui

Modified Files:
	wxMApp.h wxMenuDefs.h 
Log Message:
added support for building without dialup support (USE_DIALUP) which should 
help building under wxMac


Index: wxMApp.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMApp.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -b -u -2 -r1.58 -r1.59
--- wxMApp.h	2001/12/19 17:22:04	1.58
+++ wxMApp.h	2001/12/28 21:42:47	1.59
@@ -19,8 +19,9 @@
 #endif  //USE_PCH
 
-#include  <wx/dialup.h>
-
 // fwd decl
-class WXDLLEXPORT wxDialUpManager;
+#ifdef USE_DIALUP
+   class WXDLLEXPORT wxDialUpEvent;
+   class WXDLLEXPORT wxDialUpManager;
+#endif // USE_DIALUP
 class WXDLLEXPORT wxLocale;
 class WXDLLEXPORT wxLog;
@@ -112,4 +113,5 @@
       { return m_HelpController; }
 
+#ifdef USE_DIALUP
    virtual bool IsOnline(void) const;
    virtual void GoOnline(void) const;
@@ -119,4 +121,8 @@
    void OnDisconnected(wxDialUpEvent &event);
 
+   /// access the wxDialUpManager directly (wxMApp-specific method)
+   wxDialUpManager *GetDialUpManager() const { return m_OnlineManager; }
+#endif // USE_DIALUP
+
    virtual bool AllowBgProcessing() const;
 
@@ -129,7 +135,4 @@
    virtual void FatalError(const char *message);
 
-   /// access the wxDialUpManager directly (wxMApp-specific method)
-   wxDialUpManager *GetDialUpManager() const { return m_OnlineManager; }
-
 #ifdef __WXDEBUG__
    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
@@ -141,6 +144,13 @@
    /// makes sure the status bar has enough fields
    virtual void UpdateStatusBar(int nfields, bool isminimum = FALSE) const;
+
+#ifdef USE_DIALUP
    /// sets up the class handling dial up networking
    virtual void SetupOnlineManager(void);
+
+   /// update display of online connection status
+   void UpdateOnlineDisplay();
+#endif // USE_DIALUP
+
    /** Common code for ThrEnter and ThrLeave, if enter==TRUE, enter,
        otherwise leave.
@@ -154,7 +164,4 @@
    virtual void UnloadModules(void);
 
-   /// update display of online connection status
-   void UpdateOnlineDisplay();
-
    /// initialize the help controller, return true only if ok
    bool InitHelp();
@@ -189,8 +196,12 @@
    /// timer used to call OnIdle for MEvent handling
    wxTimer *m_IdleTimer;
+
+#ifdef USE_DIALUP
    /// online manager
    wxDialUpManager *m_OnlineManager;
+
    /// are we currently online?
    bool m_IsOnline;
+#endif // USE_DIALUP
 
    /// the log window (may be NULL)

Index: wxMenuDefs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMenuDefs.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -b -u -2 -r1.101 -r1.102
--- wxMenuDefs.h	2001/12/05 17:32:01	1.101
+++ wxMenuDefs.h	2001/12/28 21:42:47	1.102
@@ -103,7 +103,9 @@
    WXMENU_FILE_SEP3,
    WXMENU_FILE_SEND_OUTBOX,
+#ifdef USE_DIALUP
    WXMENU_FILE_SEP4,
    WXMENU_FILE_NET_ON,
    WXMENU_FILE_NET_OFF,
+#endif // USE_DIALUP
    WXMENU_FILE_SEP5,
    WXMENU_FILE_IDENT_SUBMENU_BEGIN,