conversions from int/long to wxString won't compile any more

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 94ac38d2877bb01f5f88effa2dabf6dc6d3c76f5..ef7ec0b3c6abea3072a3efecee488992b3dd1e44 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -20,49 +20,56 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
 

-// Dialog boxes
-class WXDLLEXPORT wxPanel: public wxWindow
+
+class WXDLLEXPORT wxPanel : public wxWindow

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPanel)

 public:
 public:

+  wxPanel();

 
 

-  wxPanel(void);
-
-  // Old-style constructor
-  inline wxPanel(wxWindow *parent,
-           int x = -1, int y= -1, int width = 500, int height = 500,
-           long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
+  // Old-style constructor (no default values for coordinates to avoid ambiguity
+  // with the new one)
+  wxPanel(wxWindow *parent,
+          int x, int y, int width, int height,
+          long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+          const wxString& name = wxPanelNameStr)

   {
       Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
   }
 
   // Constructor
   {
       Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
   }
 
   // Constructor

-  inline wxPanel(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
+  wxPanel(wxWindow *parent,
+          wxWindowID id = -1,
+          const wxPoint& pos = wxDefaultPosition,
+          const wxSize& size = wxDefaultSize,
+          long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+          const wxString& name = wxPanelNameStr)

   {
       Create(parent, id, pos, size, style, name);
   }
 
   bool Create(wxWindow *parent, wxWindowID id,
   {
       Create(parent, id, pos, size, style, name);
   }
 
   bool Create(wxWindow *parent, wxWindowID id,

-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr);
-
-  void OnPaint(wxPaintEvent& event);
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+              const wxString& name = wxPanelNameStr);

 
   // Sends an OnInitDialog event, which in turns transfers data to
   // to the dialog via validators.
 
   // Sends an OnInitDialog event, which in turns transfers data to
   // to the dialog via validators.

-  virtual void InitDialog(void);
+  virtual void InitDialog();

 
 

-  // Responds to colour changes
+    // Responds to colour changes

   void OnSysColourChanged(wxSysColourChangedEvent& event);
   void OnSysColourChanged(wxSysColourChangedEvent& event);

+  
+    // Process a keyboard navigation message (Tab traversal)
+  void OnNavigationKey(wxNavigationKeyEvent& event);
+
+  // override base class virtuals
+    // we don't want focus for ourselves
+  virtual bool AcceptsFocus() const { return FALSE; }

 
 

-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif