Use wxGetTranslation() instead of _() in the public headers.

[wxWidgets.git] / include / wx / generic / laywin.h

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 2bfae54daf4395adc33f7f0229ca5dd63d86ab00..a38fd97fc1e02b33022ee9073ba388351b732b8b 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        laywin.h
+// Name:        wx/generic/laywin.h

 // Purpose:     Implements a simple layout algorithm, plus
 //              wxSashLayoutWindow which is an example of a window with
 //              layout-awareness (via event handlers). This is suited to
 // Purpose:     Implements a simple layout algorithm, plus
 //              wxSashLayoutWindow which is an example of a window with
 //              layout-awareness (via event handlers). This is suited to


@@ -7,7 +7,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -24,8 +23,8 @@
 class WXDLLIMPEXP_FWD_ADV wxQueryLayoutInfoEvent;
 class WXDLLIMPEXP_FWD_ADV wxCalculateLayoutEvent;
 
 class WXDLLIMPEXP_FWD_ADV wxQueryLayoutInfoEvent;
 class WXDLLIMPEXP_FWD_ADV wxCalculateLayoutEvent;
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent )
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT,  wxCalculateLayoutEvent )
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT,  wxCalculateLayoutEvent );

 
 enum wxLayoutOrientation
 {
 
 enum wxLayoutOrientation
 {


@@ -107,7 +106,7 @@ typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEv
     wxEVENT_HANDLER_CAST( wxQueryLayoutInfoEventFunction, func )
 
 #define EVT_QUERY_LAYOUT_INFO(func) \
     wxEVENT_HANDLER_CAST( wxQueryLayoutInfoEventFunction, func )
 
 #define EVT_QUERY_LAYOUT_INFO(func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_LAYOUT_INFO, wxID_ANY, wxID_ANY, wxQueryLayoutInfoEventHandler( func ), NULL ),
+    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_LAYOUT_INFO, wxID_ANY, wxID_ANY, wxQueryLayoutInfoEventHandler( func ), NULL ),

 
 /*
  * This event is used to take a bite out of the available client area.
 
 /*
  * This event is used to take a bite out of the available client area.


@@ -146,7 +145,7 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
 #define wxCalculateLayoutEventHandler( func ) wxEVENT_HANDLER_CAST(wxCalculateLayoutEventFunction, func)
 
 #define EVT_CALCULATE_LAYOUT(func) \
 #define wxCalculateLayoutEventHandler( func ) wxEVENT_HANDLER_CAST(wxCalculateLayoutEventFunction, func)
 
 #define EVT_CALCULATE_LAYOUT(func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, wxID_ANY, wxID_ANY, wxCalculateLayoutEventHandler( func ), NULL ),
+    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, wxID_ANY, wxID_ANY, wxCalculateLayoutEventHandler( func ), NULL ),

 
 #if wxUSE_SASH
 
 
 #if wxUSE_SASH