avoiding warning because of missing define

[wxWidgets.git] / include / wx / notebook.h

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index d6b68457f04c5caeb2b09eeb747204a5e424aec5..5350a11b2692c251bea758f1aa5124dbfbd9d2ab 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -54,13 +54,13 @@ enum
 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 

-extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxNotebookNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebookBase : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxNotebookBase : public wxBookCtrlBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -106,6 +106,9 @@ public:
     // new is -1)
     void SendPageChangedEvent(int nPageOld, int nPageNew = -1);
 
     // new is -1)
     void SendPageChangedEvent(int nPageOld, int nPageNew = -1);
 

+    // wxBookCtrlBase overrides this method to return false but we do need
+    // focus because we have tabs
+    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }

 
 protected:
     DECLARE_NO_COPY_CLASS(wxNotebookBase)
 
 protected:
     DECLARE_NO_COPY_CLASS(wxNotebookBase)


@@ -115,7 +118,7 @@ protected:
 // notebook event class and related stuff
 // ----------------------------------------------------------------------------
 
 // notebook event class and related stuff
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlBaseEvent
+class WXDLLIMPEXP_CORE wxNotebookEvent : public wxBookCtrlBaseEvent

 {
 public:
     wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
 {
 public:
     wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,


@@ -135,10 +138,8 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotebookEvent)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotebookEvent)
 };
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 802)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 803)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;

 
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 


@@ -166,7 +167,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 #elif defined(__WXGTK__)
     #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)

-    #include  "wx/mac/notebook.h"
+    #include  "wx/osx/notebook.h"

 #elif defined(__WXCOCOA__)
     #include  "wx/cocoa/notebook.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include  "wx/cocoa/notebook.h"
 #elif defined(__WXPM__)