]> git.pld-linux.org Git - packages/XaraLX.git/blame - XaraLX-system_wx_aui.patch
projects / packages / XaraLX.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- Source0 download URL
[packages/XaraLX.git] / XaraLX-system_wx_aui.patch
CommitLineData
2442370e
SS		 1--- XaraLX-0.7r1766/wxXtra/framemanager.h.orig 2007-03-14 15:09:22.000000000 +0000
2+++ XaraLX-0.7r1766/wxXtra/framemanager.h 2007-03-14 15:10:04.000000000 +0000
3@@ -390,7 +390,7 @@
4
5
6
7-class WXDLLIMPEXP_AUI wxFrameManager : public wxEvtHandler
8+class WXDLLIMPEXP_AUI _don_t_use_internal_wxFrameManager : public wxEvtHandler
9 {
10 friend class wxFloatingPane;
11
12--- XaraLX-0.7r1766/wxOil/dlgmgr.h.orig 2007-03-14 11:04:23.000000000 +0000
13+++ XaraLX-0.7r1766/wxOil/dlgmgr.h 2007-03-14 11:26:12.000000000 +0000
14@@ -821,8 +821,8 @@
15
16 static void EnsurePanePreferenceDeclared(wxString key);
17 static void InitPaneInfoHash();
18- static void LoadPaneInfo(wxString key, wxPaneInfo &paneinfo);
19- static void SavePaneInfo(wxString key, wxPaneInfo &paneinfo);
20+ static void LoadPaneInfo(wxString key, wxAuiPaneInfo &paneinfo);
21+ static void SavePaneInfo(wxString key, wxAuiPaneInfo &paneinfo);
22 static IdToSerializedPaneInfo * s_pPaneInfoHash;
23
24 public:
25--- XaraLX-0.7r1766/wxOil/camelot.cpp.orig 2007-03-14 12:03:59.000000000 +0000
26+++ XaraLX-0.7r1766/wxOil/camelot.cpp 2007-03-14 19:35:30.000000000 +0000
27@@ -101,6 +101,8 @@
28 //
29 /***************************************************************************************************************************/
30
31+#include <wx/aui/aui.h>
32+#include <wx/aui/floatpane.h>
33 #include "camtypes.h"
34
35 #include "camdoc.h"
36@@ -293,7 +295,7 @@
37 {
38 TRACEUSER("luke", _T("CCamApp::FilterEvent activate to %s"), pEventObject->GetClassInfo()->GetClassName());
39
40- if( pEventObject->IsKindOf( CLASSINFO(wxFloatingPane) ) )
41+ if( pEventObject->IsKindOf( CLASSINFO(wxAuiFloatingFrame) ) )
42 {
43 wxClassInfo* pClassInfo = pEventObject->GetClassInfo();
44 while( NULL != pClassInfo )
45@@ -1039,7 +1041,7 @@
46 TRACET(_T("CCamApp::Init Setting mainframe as top window"));
47
48 m_pMainFrame->CreateToolbars();
49- m_pMainFrame->UpdateFrameManager();
50+ m_pMainFrame->UpdateManager();
51
52 // Show the main frame window
53 // make maximized if thats what we were last time, unless overridden by user
54--- XaraLX-0.7r1766/wxOil/camframe.cpp.orig 2007-03-14 13:26:19.000000000 +0000
55+++ XaraLX-0.7r1766/wxOil/camframe.cpp 2007-03-14 16:32:22.000000000 +0000
56@@ -129,14 +130,14 @@
57
58 #if defined(USE_WXAUI)
59
60-class CamFrameManager : public wxFrameManager
61+class CamFrameManager : public wxAuiManager
62 {
63 private:
64 DECLARE_CLASS( CamFrameManager )
65
66 public:
67 CamFrameManager(wxFrame* frame = NULL, unsigned int /*TYPENOTE: Correct*/ flags = wxAUI_MGR_DEFAULT)
68- : wxFrameManager(frame, flags)
69+ : wxAuiManager(frame, flags)
70 {
71 }
72
73@@ -154,7 +155,7 @@
74 event.Skip();
75 }
76
77- void OnPaneClose(wxFrameManagerEvent& event)
78+ void OnPaneClose(wxAuiManagerEvent& event)
79 {
80 // For now just pretend cancel was clicked. This is sufficient to fool
81 // dialogmanager into closing the window it would seem
82@@ -174,11 +175,11 @@
83 DECLARE_EVENT_TABLE()
84 };
85
86-IMPLEMENT_CLASS( CamFrameManager, wxFrameManager )
87-BEGIN_EVENT_TABLE( CamFrameManager, wxFrameManager )
88+IMPLEMENT_CLASS( CamFrameManager, wxAuiManager )
89+BEGIN_EVENT_TABLE( CamFrameManager, wxAuiManager )
90 EVT_SIZE(CamFrameManager::OnSize)
91 EVT_MOVE(CamFrameManager::OnMove)
92- EVT_AUI_PANECLOSE(CamFrameManager::OnPaneClose)
93+ EVT_AUI_PANE_CLOSE(CamFrameManager::OnPaneClose)
94 END_EVENT_TABLE()
95
96 #endif
97@@ -386,7 +387,7 @@
98 {
99 pColourBar->Create(this, 12345);
100
101- wxPaneInfo paneinfo;
102+ wxAuiPaneInfo paneinfo;
103 paneinfo.BottomDockable().Bottom();
104 paneinfo.CaptionVisible(false);
105 m_pFrameManager->AddPane(pColourBar, paneinfo);
106@@ -417,7 +418,7 @@
107 return TRUE;
108 }
109
110-void CCamFrame::UpdateFrameManager()
111+void CCamFrame::UpdateManager()
112 {
113 #if defined(USE_WXAUI)
114 if (m_pFrameManager)
115--- XaraLX-0.7r1766/wxOil/ccolbar.cpp.orig 2007-03-14 21:55:27.000000000 +0000
116+++ XaraLX-0.7r1766/wxOil/ccolbar.cpp 2007-03-14 21:55:41.000000000 +0000
117@@ -1070,7 +1070,7 @@
118 SetMinSize(wxSize(8, BarHeight));
119
120 InvalidateBestSize();
121- GetMainFrame()->UpdateFrameManager();
122+ GetMainFrame()->UpdateManager();
123 }
124 }
125
126@@ -3373,7 +3373,7 @@
127 else
128 {
129 TheColourBar->Refresh(true); // Redraw (clear to grey for tidier resize)
130- GetMainFrame()->UpdateFrameManager(); // Resize to add/remove the scrollbar
131+ GetMainFrame()->UpdateManager(); // Resize to add/remove the scrollbar
132 }
133 }
134
135@@ -4171,7 +4171,7 @@
136 else
137 TheColourBar->Show(false);
138
139- GetMainFrame()->UpdateFrameManager(); // And ensure it places itself usefully!
140+ GetMainFrame()->UpdateManager(); // And ensure it places itself usefully!
141 }
142 }
143
144--- XaraLX-0.7r1766/wxOil/dlgmgr.cpp.orig 2007-03-14 16:24:23.000000000 +0000
145+++ XaraLX-0.7r1766/wxOil/dlgmgr.cpp 2007-03-14 17:39:51.000000000 +0000
146@@ -470,7 +471,7 @@
147 // We really should take a wxPaneInfo() as an additional parameter to this function to allow this sort
148 // of stuff to be specified. Or try and retrieve it from the DialogBarOp or similar. Anyway, for now
149 // give it some default parameters
150- wxPaneInfo paneinfo;
151+ wxAuiPaneInfo paneinfo;
152 if (!DlgOp->IsABar())
153 {
154 // default galleries to 300 deep. Specifying -1 as a width doesn't seem to work
155@@ -519,19 +520,19 @@
156
157 // Ensure the main frame is shown if the pane is floating, or it can get "behind"
158 // the main frame on wxGTK
159- if (paneinfo.IsFloating() && !CCamFrame::GetFrameManager()->GetManagedWindow()->IsShown())
160- CCamFrame::GetFrameManager()->GetManagedWindow()->Show();
161+ if (paneinfo.IsFloating() && !CCamFrame::GetManager()->GetManagedWindow()->IsShown())
162+ CCamFrame::GetManager()->GetManagedWindow()->Show();
163
164- CCamFrame::GetFrameManager()->AddPane(pDialogWnd, paneinfo);
165+ CCamFrame::GetManager()->AddPane(pDialogWnd, paneinfo);
166
167- CCamFrame::GetMainFrame()->UpdateFrameManager();
168+ CCamFrame::GetMainFrame()->UpdateManager();
169
170 // Make sure newly created floating panes are at the top in an attempt to fix
171 // Bugzilla bug 1393 (can't duplicate here...)
172 wxWindow * pTLW = pDialogWnd;
173 while (pTLW->GetParent())
174 pTLW=pTLW->GetParent();
175- if (pTLW->IsKindOf(CLASSINFO(wxFloatingPane)))
176+ if (pTLW->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
177 pTLW->Raise();
178
179 }
180@@ -862,7 +863,7 @@
181
182 ********************************************************************************************/
183
184-void DialogManager::LoadPaneInfo(wxString key, wxPaneInfo &paneinfo)
185+void DialogManager::LoadPaneInfo(wxString key, wxAuiPaneInfo &paneinfo)
186 {
187 if (!s_pPaneInfoHash)
188 InitPaneInfoHash();
189@@ -884,7 +885,7 @@
190 TRACEUSER("amb", _T("val=%s"), (const TCHAR *)(i->second));
191
192 wxString name = (wxString)((const TCHAR *)(i->second));
193- CCamFrame::GetFrameManager()->LoadPaneInfo(name, paneinfo);
194+ CCamFrame::GetManager()->LoadPaneInfo(name, paneinfo);
195 }
196
197 /********************************************************************************************
198@@ -901,7 +902,7 @@
199
200 ********************************************************************************************/
201
202-void DialogManager::SavePaneInfo(wxString key, wxPaneInfo &paneinfo)
203+void DialogManager::SavePaneInfo(wxString key, wxAuiPaneInfo &paneinfo)
204 {
205 // work around mysterious wxGTK sizing bug
206 if ((paneinfo.IsOk()) && (paneinfo.IsFloating()))
207@@ -917,7 +918,7 @@
208
209 EnsurePanePreferenceDeclared(key);
210
211- (*s_pPaneInfoHash)[key]=CCamFrame::GetFrameManager()->SavePaneInfo(paneinfo);
212+ (*s_pPaneInfoHash)[key]=CCamFrame::GetManager()->SavePaneInfo(paneinfo);
213 }
214
215 /********************************************************************************************
216@@ -993,7 +994,7 @@
217 }
218
219 if (pDlgOp->pEvtHandler->wxAUImanaged)
220- CCamFrame::GetMainFrame()->UpdateFrameManager();
221+ CCamFrame::GetMainFrame()->UpdateManager();
222
223 }
224
225@@ -1040,7 +1041,7 @@
226 }
227
228 if (pDlgOp->pEvtHandler->wxAUImanaged)
229- CCamFrame::GetMainFrame()->UpdateFrameManager();
230+ CCamFrame::GetMainFrame()->UpdateManager();
231 }
232
233
234@@ -1088,7 +1089,7 @@
235 ERROR2IF(!WindowID, FALSE, "BringToTop called on a dialog without a window");
236 ( (wxWindow *)WindowID )->Raise();
237 if (pDlgOp->pEvtHandler->wxAUImanaged)
238- CCamFrame::GetMainFrame()->UpdateFrameManager();
239+ CCamFrame::GetMainFrame()->UpdateManager();
240 return TRUE;
241 }
242
243@@ -1895,12 +1896,12 @@
244
245 if (pDlgOp->pEvtHandler->wxAUImanaged)
246 {
247- wxPaneInfo paneinfo = CCamFrame::GetMainFrame()->GetFrameManager()->GetPane(pCWnd);
248+ wxAuiPaneInfo paneinfo = CCamFrame::GetMainFrame()->GetManager()->GetPane(pCWnd);
249 if (paneinfo.IsOk())
250 SavePaneInfo(wxString(CamResource::GetObjectName(pCWnd->GetId())), paneinfo);
251 // Remove the bar from wxAUI
252- CCamFrame::GetMainFrame()->GetFrameManager()->DetachPane(pCWnd);
253- CCamFrame::GetMainFrame()->UpdateFrameManager();
254+ CCamFrame::GetMainFrame()->GetManager()->DetachPane(pCWnd);
255+ CCamFrame::GetMainFrame()->UpdateManager();
256 }
257
258 // Delete all discardable strings associated with the dialog
259--- XaraLX-0.7r1766/wxOil/camframe.h.orig 2007-03-14 13:26:22.000000000 +0000
260+++ XaraLX-0.7r1766/wxOil/camframe.h 2007-03-14 16:32:09.000000000 +0000
261@@ -98,7 +98,6 @@
262 #include <wx/fl/frmview.h>
263 // Forward definitions
264 class CCamCanvas;
265-class wxFrameManager;
266 class CaptureWnd;
267
268 class CCamFrame :
269@@ -114,7 +115,7 @@
270
271 wxMenu *m_editMenu;
272 #if defined(USE_WXAUI)
273- wxFrameManager *m_pFrameManager;
274+ wxAuiManager *m_pFrameManager;
275 #endif
276 wxStatusBar* m_pStatusBar;
277
278@@ -130,13 +131,13 @@
279 ~CCamFrame();
280
281 static CCamFrame * GetMainFrame() {return m_pMainFrame;}
282- static wxFrameManager * GetFrameManager() { return m_pMainFrame?m_pMainFrame->m_pFrameManager:NULL;}
283+ static wxAuiManager * GetManager() { return m_pMainFrame?m_pMainFrame->m_pFrameManager:NULL;}
284
285 wxStatusBar* GetStatusBar() const { return m_pStatusBar; }
286
287 BOOL CreateToolbars();
288
289- void UpdateFrameManager();
290+ void UpdateManager();
291
292 /// Creation
293 bool Create( wxWindow *parent, wxWindowID id = -1, const wxString &caption = wxT("wxTemplate"),
294--- XaraLX-0.7r1766/class-renaming.txt.orig 2007-03-14 15:08:35.000000000 +0000
295+++ XaraLX-0.7r1766/class-renaming.txt 2007-03-14 15:08:35.000000000 +0000
296@@ -0,0 +1,6 @@
297+XaraLX name wxAui name
298+
299+wxFloatingPane wxAuiFloatingFrame
300+wxFrameManager wxAuiManager
301+wxFrameManagerEvent wxAuiManagerEvent
302+wxPaneInfo wxAuiPaneInfo
Xara Extreme LX Vector Image Editor
This page took 0.08155 seconds and 4 git commands to generate.