Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently.

[wxWidgets.git] / include / wx / motif / app.h

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 092e6515a7f008b8a06daa97b08dff5fbfe0e000..650736e9c3ce7e6d9664650f441f58aae54b3d6e 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -13,7 +13,7 @@
 #define _WX_APP_H_
 
 #ifdef __GNUG__
 #define _WX_APP_H_
 
 #ifdef __GNUG__

-    #pragma interface "app.h"
+#pragma interface "app.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -39,93 +39,91 @@ class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {

-DECLARE_DYNAMIC_CLASS(wxApp)
-
+    DECLARE_DYNAMIC_CLASS(wxApp)
+        

 public:
     wxApp();
     ~wxApp() {}
 public:
     wxApp();
     ~wxApp() {}

-
+    

     // override base class (pure) virtuals
     // -----------------------------------
     // override base class (pure) virtuals
     // -----------------------------------

-
+    

     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);

-
+    virtual bool ProcessIdle();
+    

     virtual bool OnInitGui();
     virtual bool OnInitGui();

-
-    virtual wxIcon GetStdIcon(int which) const;
-
+    

     // implementation from now on
     // --------------------------
     // implementation from now on
     // --------------------------

-
+    

     void OnIdle(wxIdleEvent& event);
     void OnIdle(wxIdleEvent& event);

-
+    

     // Send idle event to all top-level windows.
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents();
     // Send idle event to all top-level windows.
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents();

-
+    

     // Send idle event to window and all subwindows
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
     // Send idle event to window and all subwindows
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);

-
+    

     // Motif implementation.
     // Motif implementation.

-
+    

     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);
     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);

-
+    

     // Returns TRUE if an accelerator has been processed
     virtual bool CheckForAccelerator(WXEvent* event);
     // Returns TRUE if an accelerator has been processed
     virtual bool CheckForAccelerator(WXEvent* event);

-
+    

     // Returns TRUE if a key down event has been processed
     virtual bool CheckForKeyDown(WXEvent* event);
     // Returns TRUE if a key down event has been processed
     virtual bool CheckForKeyDown(WXEvent* event);

-
+    

     // Returns TRUE if a key up event has been processed
     virtual bool CheckForKeyUp(WXEvent* event);
     // Returns TRUE if a key up event has been processed
     virtual bool CheckForKeyUp(WXEvent* event);

-
+    

 protected:
     bool                  m_showOnInit;
 protected:
     bool                  m_showOnInit;

-
+    

 public:
     // Implementation
     static bool Initialize();
     static void CleanUp();
 public:
     // Implementation
     static bool Initialize();
     static void CleanUp();

-
+    

     void DeletePendingObjects();
     void DeletePendingObjects();

-    bool ProcessIdle();
-
+    

     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
     WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
     WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
     long           GetMaxRequestSize() const { return m_maxRequestSize; }

-
+    

     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);

-
+    

 public:
     static long    sm_lastMessageTime;
     int            m_nCmdShow;
 public:
     static long    sm_lastMessageTime;
     int            m_nCmdShow;

-
+    

 protected:
     bool                  m_keepGoing;
 protected:
     bool                  m_keepGoing;

-
+    

     // Motif-specific
     WXAppContext          m_appContext;
     WXWidget              m_topLevelWidget;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;
     // Motif-specific
     WXAppContext          m_appContext;
     WXWidget              m_topLevelWidget;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;

-
+    

     DECLARE_EVENT_TABLE()
 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 
 #endif
     DECLARE_EVENT_TABLE()
 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 
 #endif

-    // _WX_APP_H_
+// _WX_APP_H_