Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 33f4443e00a2f2099c8b525608a0aee47c65bc22..cf33821234c76f3f5b8ea0a62df05110f5b9ae7d 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/os2/app.h

 // Purpose:     wxApp class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxApp class
 // Author:      David Webster
 // Modified by:


@@ -43,14 +43,14 @@ class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 class WXDLLIMPEXP_FWD_BASE wxLog;
 
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 class WXDLLIMPEXP_FWD_BASE wxLog;
 

-WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
-WXDLLEXPORT_DATA(extern HAB)    vHabmain;
+WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp;
+WXDLLIMPEXP_DATA_CORE(extern HAB)    vHabmain;

 
 // Force an exit from main loop
 
 // Force an exit from main loop

-void WXDLLEXPORT wxExit(void);
+void WXDLLIMPEXP_CORE wxExit(void);

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-bool WXDLLEXPORT wxYield(void);
+bool WXDLLIMPEXP_CORE wxYield(void);

 
 extern MRESULT EXPENTRY wxWndProc( HWND
                                   ,ULONG
 
 extern MRESULT EXPENTRY wxWndProc( HWND
                                   ,ULONG


@@ -61,7 +61,7 @@ extern MRESULT EXPENTRY wxWndProc( HWND
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application

-class WXDLLEXPORT wxApp : public wxAppBase
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase

 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 


@@ -75,7 +75,6 @@ public:
 
     virtual bool OnInitGui(void);
 
 
     virtual bool OnInitGui(void);
 

-    virtual bool Yield(bool onlyIfNeeded = false);

     virtual void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
     virtual void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }


@@ -117,7 +116,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
 
 protected:
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);

 };
 #endif
     // _WX_APP_H_
 };
 #endif
     // _WX_APP_H_