Check-in [6f724b492e]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Correct the various C++ errors.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | wip-midlcdui
Files: files | file ages | folders
SHA1:6f724b492e91350d8ac7434482c1a13035955bb4
User & Date: stephanie.gawroriski 2020-07-31 15:00:23
Context
2020-07-31
15:00
Merge from trunk. check-in: a14fa0c876 user: stephanie.gawroriski tags: wip-midlcdui
15:00
Correct the various C++ errors. check-in: 6f724b492e user: stephanie.gawroriski tags: wip-midlcdui
2020-07-28
00:53
Add test for canvas repaint. check-in: fe72585226 user: stephanie.gawroriski tags: wip-midlcdui
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to emulators/emulator-base/src/main/cpp/mle_form.cpp.

87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
...
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
...
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
...
204
205
206
207
208
209
210
211
212
213
		"equals", SWINGUIFORM_EQUALSITEM_DESC,
		a, b);
}

JNIEXPORT void JNICALL Impl_mle_FormShelf_flushEvents(JNIEnv* env,
	jclass classy)
{
	forwardCallStaticVoidenv, SWINGUIFORM_CLASSNAME,
		"flushEvents", SWINGUIFORM_FLUSHEVENTS_DESC);
}

JNIEXPORT void JNICALL Impl_mle_FormShelf_formDelete(JNIEnv* env,
	jclass classy, jobject form)
{
	forwardCallStaticVoid(env, SWINGUIFORM_CLASSNAME,
................................................................................
JNIEXPORT jobject JNICALL Impl_mle_FormShelf_formNew(JNIEnv* env,
	jclass classy)
{
	return forwardCallStaticObject(env, SWINGUIFORM_CLASSNAME,
		"formNew", SWINGUIFORM_FORMNEW_DESC);
}

JNIEXPORT jobject JNICALL Impl_mle_FormShelf_injector(JINEnv* env,
	jclass classy)
{
	return forwardCallStaticObject(env, SWINGUIFORM_CLASSNAME,
		"injector", SWINGUIFORM_INJECTOR_DESC);
}

JNIEXPORT void JNICALL Impl_mle_FormShelf_itemDelete(JNIEnv* env,
................................................................................
	jint metricId)
{
	return forwardCallStaticInteger(env, SWINGUIFORM_CLASSNAME,
		"metric", SWINGUIFORM_METRIC_DESC,
		metricId);
}

static const JNINativeMethod mleforwardMethods[] =
{
	{"callback", SWINGUIFORM_CALLBACK_DESC, (void*)Impl_mle_FormShelf_callback},
	{"displays", SWINGUIFORM_DISPLAYS_DESC, (void*)Impl_mle_FormShelf_displays},
	{"displayCurrent", SWINGUIFORM_DISPLAYCURRENT_DESC, (void*)Impl_mle_FormShelf_displayCurrent},
	{"displayShow", SWINGUIFORM_DISPLAYSHOW_DESC, (void*)Impl_mle_FormShelf_displayShow},
	{"equals", SWINGUIFORM_EQUALSDISPLAY_DESC, (void*)Impl_mle_FormShelf_equalsDisplay},
	{"equals", SWINGUIFORM_EQUALSFORM_DESC, (void*)Impl_mle_FormShelf_equalsForm},
	{"equals", SWINGUIFORM_EQUALSITEM_DESC, (void*)Impl_mle_FormShelf_equalsItem},
	{"flushEvents", SWINGUIFORM_FLUSHEVENTS_DESC, (void)Impl_mle_FormShelf_flushEvents},
	{"formDelete", SWINGUIFORM_FORMDELETE_DESC, (void*)Impl_mle_FormShelf_formDelete},
	{"formItemAtPosition", SWINGUIFORM_FORMITEMATPOSITION_DESC, (void*)Impl_mle_FormShelf_formItemAtPosition},
	{"formItemCount", SWINGUIFORM_FORMITEMCOUNT_DESC, (void*)Impl_mle_FormShelf_formItemCount},
	{"formItemPosition", SWINGUIFORM_FORMITEMPOSITIONGET_DESC, (void*)Impl_mle_FormShelf_formItemPositionGet},
	{"formItemPosition", SWINGUIFORM_FORMITEMPOSITIONSET_DESC, (void*)Impl_mle_FormShelf_formItemPositionSet},
	{"formItemRemove", SWINGUIFORM_FORMITEMREMOVE_DESC, (void*)Impl_mle_FormShelf_formItemRemove},
	{"formNew", SWINGUIFORM_FORMNEW_DESC, (void*)Impl_mle_FormShelf_formNew},
................................................................................
	{"metric", SWINGUIFORM_METRIC_DESC, (void*)Impl_mle_FormShelf_metric},
};

jint JNICALL mleFormInit(JNIEnv* env, jclass classy)
{
	return env->RegisterNatives(
		env->FindClass("cc/squirreljme/jvm/mle/UIFormShelf"),
		mleforwardMethods, sizeof(mleforwardMethods) /
			sizeof(JNINativeMethod));
}







|







 







|







 







|








|







 







<
|

87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
...
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
...
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
...
204
205
206
207
208
209
210

211
212
		"equals", SWINGUIFORM_EQUALSITEM_DESC,
		a, b);
}

JNIEXPORT void JNICALL Impl_mle_FormShelf_flushEvents(JNIEnv* env,
	jclass classy)
{
	forwardCallStaticVoid(env, SWINGUIFORM_CLASSNAME,
		"flushEvents", SWINGUIFORM_FLUSHEVENTS_DESC);
}

JNIEXPORT void JNICALL Impl_mle_FormShelf_formDelete(JNIEnv* env,
	jclass classy, jobject form)
{
	forwardCallStaticVoid(env, SWINGUIFORM_CLASSNAME,
................................................................................
JNIEXPORT jobject JNICALL Impl_mle_FormShelf_formNew(JNIEnv* env,
	jclass classy)
{
	return forwardCallStaticObject(env, SWINGUIFORM_CLASSNAME,
		"formNew", SWINGUIFORM_FORMNEW_DESC);
}

JNIEXPORT jobject JNICALL Impl_mle_FormShelf_injector(JNIEnv* env,
	jclass classy)
{
	return forwardCallStaticObject(env, SWINGUIFORM_CLASSNAME,
		"injector", SWINGUIFORM_INJECTOR_DESC);
}

JNIEXPORT void JNICALL Impl_mle_FormShelf_itemDelete(JNIEnv* env,
................................................................................
	jint metricId)
{
	return forwardCallStaticInteger(env, SWINGUIFORM_CLASSNAME,
		"metric", SWINGUIFORM_METRIC_DESC,
		metricId);
}

static const JNINativeMethod mleFormMethods[] =
{
	{"callback", SWINGUIFORM_CALLBACK_DESC, (void*)Impl_mle_FormShelf_callback},
	{"displays", SWINGUIFORM_DISPLAYS_DESC, (void*)Impl_mle_FormShelf_displays},
	{"displayCurrent", SWINGUIFORM_DISPLAYCURRENT_DESC, (void*)Impl_mle_FormShelf_displayCurrent},
	{"displayShow", SWINGUIFORM_DISPLAYSHOW_DESC, (void*)Impl_mle_FormShelf_displayShow},
	{"equals", SWINGUIFORM_EQUALSDISPLAY_DESC, (void*)Impl_mle_FormShelf_equalsDisplay},
	{"equals", SWINGUIFORM_EQUALSFORM_DESC, (void*)Impl_mle_FormShelf_equalsForm},
	{"equals", SWINGUIFORM_EQUALSITEM_DESC, (void*)Impl_mle_FormShelf_equalsItem},
	{"flushEvents", SWINGUIFORM_FLUSHEVENTS_DESC, (void*)Impl_mle_FormShelf_flushEvents},
	{"formDelete", SWINGUIFORM_FORMDELETE_DESC, (void*)Impl_mle_FormShelf_formDelete},
	{"formItemAtPosition", SWINGUIFORM_FORMITEMATPOSITION_DESC, (void*)Impl_mle_FormShelf_formItemAtPosition},
	{"formItemCount", SWINGUIFORM_FORMITEMCOUNT_DESC, (void*)Impl_mle_FormShelf_formItemCount},
	{"formItemPosition", SWINGUIFORM_FORMITEMPOSITIONGET_DESC, (void*)Impl_mle_FormShelf_formItemPositionGet},
	{"formItemPosition", SWINGUIFORM_FORMITEMPOSITIONSET_DESC, (void*)Impl_mle_FormShelf_formItemPositionSet},
	{"formItemRemove", SWINGUIFORM_FORMITEMREMOVE_DESC, (void*)Impl_mle_FormShelf_formItemRemove},
	{"formNew", SWINGUIFORM_FORMNEW_DESC, (void*)Impl_mle_FormShelf_formNew},
................................................................................
	{"metric", SWINGUIFORM_METRIC_DESC, (void*)Impl_mle_FormShelf_metric},
};

jint JNICALL mleFormInit(JNIEnv* env, jclass classy)
{
	return env->RegisterNatives(
		env->FindClass("cc/squirreljme/jvm/mle/UIFormShelf"),

		mleFormMethods, sizeof(mleFormMethods) / sizeof(JNINativeMethod));
}